diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/googlemap/editconfig.php | 80 | ||||
| -rw-r--r-- | modules/googlemap/flags.php | 6 | ||||
| -rw-r--r-- | modules/lightbox/lb_editconfig.php | 24 | ||||
| -rw-r--r-- | modules/login_block/module.php | 20 |
4 files changed, 59 insertions, 71 deletions
diff --git a/modules/googlemap/editconfig.php b/modules/googlemap/editconfig.php index 8a760320c4..817cc8db63 100644 --- a/modules/googlemap/editconfig.php +++ b/modules/googlemap/editconfig.php @@ -39,7 +39,7 @@ require WT_ROOT.'includes/functions/functions_edit.php'; $action=safe_REQUEST($_REQUEST, 'action'); -function print_level_config_table($level, $i) { +function print_level_config_table($level) { global $GM_MARKER_COLOR, $GM_MARKER_SIZE, $GM_PREFIX; global $GM_POSTFIX, $GM_PRE_POST_MODE, $GM_MAX_NOF_LEVELS; ?> @@ -55,7 +55,7 @@ function print_level_config_table($level, $i) { <?php echo i18n::translate('Prefix'), help_link('GM_NAME_PREFIX','googlemap'); ?> </td> <td> - <input type="text" name="NEW_GM_PREFIX_<?php echo $level;?>" value="<?php echo $GM_PREFIX[$level];?>" size="20" tabindex="<?php echo $i; ?>" /> + <input type="text" name="NEW_GM_PREFIX_<?php echo $level;?>" value="<?php echo $GM_PREFIX[$level];?>" size="20" /> </td> </tr> <tr> @@ -63,7 +63,7 @@ function print_level_config_table($level, $i) { <?php echo i18n::translate('Postfix'), help_link('GM_NAME_POSTFIX','googlemap'); ?> </td> <td> - <input type="text" name="NEW_GM_POSTFIX_<?php echo $level;?>" value="<?php echo $GM_POSTFIX[$level];?>" size="20" tabindex="<?php echo $i; ?>" /> + <input type="text" name="NEW_GM_POSTFIX_<?php echo $level;?>" value="<?php echo $GM_POSTFIX[$level];?>" size="20" /> </td> </tr> <tr> @@ -71,7 +71,7 @@ function print_level_config_table($level, $i) { <?php echo i18n::translate('Prefix / Postfix order'), help_link('GM_NAME_PRE_POST','googlemap'); ?> </td> <td> - <select name="NEW_GM_PRE_POST_MODE_<?php echo $level;?>" dir="ltr" tabindex="<?php echo $i; ?>" onchange="showSelectedLevels()"> + <select name="NEW_GM_PRE_POST_MODE_<?php echo $level;?>" dir="ltr" onchange="showSelectedLevels()"> <option value="0"<?php if ($GM_PRE_POST_MODE[$level] == 0) echo ' selected="selected"';?>><?php echo i18n::translate('No pre/postfix');?></option> <option value="1"<?php if ($GM_PRE_POST_MODE[$level] == 1) echo ' selected="selected"';?>><?php echo i18n::translate('Normal, prefix, postfix, both');?></option> <option value="2"<?php if ($GM_PRE_POST_MODE[$level] == 2) echo ' selected="selected"';?>><?php echo i18n::translate('Normal, postfix, prefix, both');?></option> @@ -137,8 +137,6 @@ if ($action=="update" && !isset($security_user)) { require WT_ROOT.'modules/googlemap/defaultconfig.php'; } -$i = 0; - ?> <script language="JavaScript" type="text/javascript"> <!-- @@ -202,7 +200,7 @@ $i = 0; <?php echo i18n::translate('Enable GoogleMap'), help_link('GOOGLEMAP_ENABLE','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_ENABLE', $GOOGLEMAP_ENABLED, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_ENABLE', $GOOGLEMAP_ENABLED); ?> </td> </tr> <tr> @@ -210,7 +208,7 @@ $i = 0; <?php echo i18n::translate('GoogleMap API key'), help_link('GOOGLEMAP_API_KEY','googlemap'); ?> </td> <td class="optionbox width60"> - <input type="text" name="NEW_GM_API_KEY" value="<?php echo $GOOGLEMAP_API_KEY;?>" size="60" tabindex="<?php echo ++$i; ?>" /> + <input type="text" name="NEW_GM_API_KEY" value="<?php echo $GOOGLEMAP_API_KEY;?>" size="60" /> </td> </tr> <tr> @@ -218,7 +216,7 @@ $i = 0; <?php echo i18n::translate('Default map type'), help_link('GOOGLEMAP_MAP_TYPE','googlemap'); ?> </td> <td class="optionbox width60"> - <select name="NEW_GM_MAP_TYPE" tabindex="<?php echo ++$i; ?>"> + <select name="NEW_GM_MAP_TYPE"> <option value="G_NORMAL_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_NORMAL_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Map');?></option> <option value="G_SATELLITE_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_SATELLITE_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Satellite');?></option> <option value="G_HYBRID_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_HYBRID_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Hybrid');?></option> @@ -232,9 +230,9 @@ $i = 0; </td> <td class="optionbox width60"> <?php echo i18n::translate('Width'); ?> - <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE;?>" size="10" tabindex="<?php echo ++$i; ?>" /> + <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE;?>" size="10" /> <?php echo i18n::translate('Height'); ?> - <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE;?>" size="10" tabindex="<?php echo ++$i; ?>" /> + <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE;?>" size="10" /> </td> </tr> <tr> @@ -242,7 +240,7 @@ $i = 0; <?php echo i18n::translate('Use Googlemap for Place Hierarchy'), help_link('GOOGLEMAP_PH','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_PLACE_HIERARCHY', $GOOGLEMAP_PLACE_HIERARCHY, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_PLACE_HIERARCHY', $GOOGLEMAP_PLACE_HIERARCHY); ?> </td> </tr> <tr> @@ -251,9 +249,9 @@ $i = 0; </td> <td class="optionbox width60"> <?php echo i18n::translate('Width'); ?> - <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE;?>" size="10" tabindex="<?php echo ++$i; ?>" /> + <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE;?>" size="10" /> <?php echo i18n::translate('Height'); ?> - <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE;?>" size="10" tabindex="<?php echo ++$i; ?>" /> + <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE;?>" size="10" /> </td> </tr> <tr> @@ -261,7 +259,7 @@ $i = 0; <?php echo i18n::translate('Type of place markers in Place Hierarchy'), help_link('GOOGLEMAP_PH_MARKER','googlemap'); ?> </td> <td class="optionbox width60"> - <select name="NEW_GM_PH_MARKER" tabindex="<?php echo ++$i; ?>"> + <select name="NEW_GM_PH_MARKER"> <option value="G_DEFAULT_ICON" <?php if ($GOOGLEMAP_PH_MARKER=="G_DEFAULT_ICON") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Standard');?></option> <option value="G_FLAG" <?php if ($GOOGLEMAP_PH_MARKER=="G_FLAG") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Flag');?></option> </select> @@ -272,7 +270,7 @@ $i = 0; <?php echo i18n::translate('Display short placenames'), help_link('GM_DISP_SHORT_PLACE','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_DISP_SHORT_PLACE', $GM_DISP_SHORT_PLACE, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_DISP_SHORT_PLACE', $GM_DISP_SHORT_PLACE); ?> </td> </tr> <tr> @@ -280,7 +278,7 @@ $i = 0; <?php echo i18n::translate('Display indis and families count'), help_link('GM_DISP_COUNT','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_DISP_COUNT', $GM_DISP_COUNT, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_DISP_COUNT', $GM_DISP_COUNT); ?> </td> </tr> <tr> @@ -288,7 +286,7 @@ $i = 0; <?php echo i18n::translate('Use mouse wheel for zoom'), help_link('GOOGLEMAP_PH_WHEEL','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_PH_WHEEL', $GOOGLEMAP_PH_WHEEL, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_PH_WHEEL', $GOOGLEMAP_PH_WHEEL); ?> </td> </tr> <tr> @@ -296,7 +294,7 @@ $i = 0; <?php echo i18n::translate('Hide map controls'), help_link('GOOGLEMAP_PH_CONTROLS','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_PH_CONTROLS', $GOOGLEMAP_PH_CONTROLS, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_PH_CONTROLS', $GOOGLEMAP_PH_CONTROLS); ?> </td> </tr> <tr> @@ -304,7 +302,7 @@ $i = 0; <?php echo i18n::translate('Display Map Co-ordinates'), help_link('GOOGLEMAP_COORD','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo edit_field_yes_no('NEW_GM_COORD', $GOOGLEMAP_COORD, 'tabindex="'.(++$i).'"'); ?> + <?php echo edit_field_yes_no('NEW_GM_COORD', $GOOGLEMAP_COORD); ?> </td> </tr> <tr> @@ -312,12 +310,12 @@ $i = 0; <?php echo i18n::translate('Zoom factor of map'), help_link('GOOGLEMAP_MAP_ZOOM','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo i18n::translate('minimum');?>: <select name="NEW_GM_MIN_ZOOM" tabindex="<?php echo ++$i; ?>"> + <?php echo i18n::translate('minimum');?>: <select name="NEW_GM_MIN_ZOOM"> <?php for ($j=1; $j < 15; $j++) { ?> <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MIN_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> </select> - <?php echo i18n::translate('maximum');?>: <select name="NEW_GM_MAX_ZOOM" tabindex="<?php echo ++$i; ?>"> + <?php echo i18n::translate('maximum');?>: <select name="NEW_GM_MAX_ZOOM"> <?php for ($j=1; $j < 15; $j++) { ?> <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MAX_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -332,7 +330,7 @@ $i = 0; <table> <tr> <td><?php echo i18n::translate('Country');?> </td> - <td><select name="NEW_GM_PRECISION_0" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_0"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_0==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -341,7 +339,7 @@ $i = 0; </tr> <tr> <td><?php echo i18n::translate('State');?> </td> - <td><select name="NEW_GM_PRECISION_1" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_1"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_1==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -350,7 +348,7 @@ $i = 0; </tr> <tr> <td><?php echo i18n::translate('City');?> </td> - <td><select name="NEW_GM_PRECISION_2" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_2"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_2==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -358,7 +356,7 @@ $i = 0; </td> </tr> <tr><td><?php echo i18n::translate('Neighborhood');?> </td> - <td><select name="NEW_GM_PRECISION_3" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_3"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_3==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -366,7 +364,7 @@ $i = 0; </td> </tr> <tr><td><?php echo i18n::translate('House');?> </td> - <td><select name="NEW_GM_PRECISION_4" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_4"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_4==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -374,7 +372,7 @@ $i = 0; </td> </tr> <tr><td><?php echo i18n::translate('Max');?> </td> - <td><select name="NEW_GM_PRECISION_5" tabindex="<?php echo ++$i; ?>"> + <td><select name="NEW_GM_PRECISION_5"> <?php for ($j=0; $j < 10; $j++) { ?> <option value="<?php echo $j;?>"<?php if ($GOOGLEMAP_PRECISION_5==$j) echo " selected=\"selected\""; echo ">", $j;?></option> <?php } ?> @@ -386,12 +384,12 @@ $i = 0; </tr> <tr> <td class="descriptionbox nowrap"><?php echo i18n::translate('Default top level value'), help_link('GM_DEFAULT_LEVEL_0','googlemap'); ?></td> - <td class="optionbox width60"><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE;?>" size="20" tabindex="<?php echo ++$i; ?>" /></td> + <td class="optionbox width60"><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE;?>" size="20" /></td> </tr> <tr> <td class="descriptionbox nowrap"><?php echo i18n::translate('Number of levels'), help_link('GM_NOF_LEVELS','googlemap'); ?></td> <td class="optionbox width60"> - <select name="NEW_GM_LEVEL_COUNT" dir="ltr" tabindex="<?php echo ++$i; ?>" onchange="showSelectedLevels()"> + <select name="NEW_GM_LEVEL_COUNT" dir="ltr" onchange="showSelectedLevels()"> <option value="1"<?php if ($GM_MAX_NOF_LEVELS == 1) echo " selected=\"selected\"";?>>1</option> <option value="2"<?php if ($GM_MAX_NOF_LEVELS == 2) echo " selected=\"selected\"";?>>2</option> <option value="3"<?php if ($GM_MAX_NOF_LEVELS == 3) echo " selected=\"selected\"";?>>3</option> @@ -410,15 +408,15 @@ $i = 0; </td> <td class="optionbox width60"> <?php - print_level_config_table(1, ++$i); - print_level_config_table(2, ++$i); - print_level_config_table(3, ++$i); - print_level_config_table(4, ++$i); - print_level_config_table(5, ++$i); - print_level_config_table(6, ++$i); - print_level_config_table(7, ++$i); - print_level_config_table(8, ++$i); - print_level_config_table(9, ++$i); + print_level_config_table(1); + print_level_config_table(2); + print_level_config_table(3); + print_level_config_table(4); + print_level_config_table(5); + print_level_config_table(6); + print_level_config_table(7); + print_level_config_table(8); + print_level_config_table(9); ?> </td> </tr> @@ -430,9 +428,9 @@ $i = 0; </td> <tr> <td class="descriptionbox" colspan="2" align="center"> - <input type="submit" tabindex="<?php echo ++$i; ?>" value="<?php echo i18n::translate('Save configuration');?>" onclick="closeHelp();" /> + <input type="submit" value="<?php echo i18n::translate('Save configuration');?>" onclick="closeHelp();" /> - <input type="reset" tabindex="<?php echo ++$i; ?>" value="<?php echo i18n::translate('Reset');?>" /> + <input type="reset" value="<?php echo i18n::translate('Reset');?>" /> </td> </tr> </table> diff --git a/modules/googlemap/flags.php b/modules/googlemap/flags.php index 7e994a0da3..6b4e19dd7c 100644 --- a/modules/googlemap/flags.php +++ b/modules/googlemap/flags.php @@ -156,7 +156,7 @@ else { <tr> <td class="optionbox" colspan="4"> <?php echo help_link('PLE_FLAGS','googlemap'); ?> - <select name="COUNTRYSELECT" dir="ltr" tabindex="0" onchange="selectCountry()"> + <select name="COUNTRYSELECT" dir="ltr" onchange="selectCountry()"> <option value="Countries"><?php echo i18n::translate('Countries'); ?></option> <?php foreach ($countryList as $country_key=>$country_name) { echo "<option value=\"", $country_key, "\""; @@ -171,13 +171,13 @@ else { $j = 1; for ($i = 0; $i < count($flags); $i++) { if ($countrySelected == "Countries") { - $tempstr = "<td><input type=\"radio\" dir=\"ltr\" tabindex=\"".($i+1)."\" name=\"FLAGS\" value=\"".$i."\" onchange=\"enableButtons();\"><img src=\"places/flags/".$flags[$i].".gif\" alt=\"".$flags[$i]."\" title=\""; + $tempstr = "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"".$i."\" onchange=\"enableButtons();\"><img src=\"places/flags/".$flags[$i].".gif\" alt=\"".$flags[$i]."\" title=\""; if ($flags[$i]!='blank') $tempstr.=i18n::translate($countries[$flags[$i]]); else $tempstr.=i18n::translate($countries['???']); echo $tempstr, "\"> ", $flags[$i], "</input></td>\n"; } else { - echo "<td><input type=\"radio\" dir=\"ltr\" tabindex=\"", ($i+1), "\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"places/", $countrySelected, "/flags/", $flags[$i], ".gif\"> ", $flags[$i], "</input></td>\n"; + echo "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"places/", $countrySelected, "/flags/", $flags[$i], ".gif\"> ", $flags[$i], "</input></td>\n"; } if ($j == 4) { echo "</tr><tr>\n"; diff --git a/modules/lightbox/lb_editconfig.php b/modules/lightbox/lb_editconfig.php index 98528820d6..065eec409c 100644 --- a/modules/lightbox/lb_editconfig.php +++ b/modules/lightbox/lb_editconfig.php @@ -73,8 +73,6 @@ if ($action=='update' && !isset($security_user)) { require WT_ROOT.'modules/lightbox/lb_defaultconfig.php'; } -$i = 0; - ?> <form method="post" name="configform" action="<?php print encode_url("module.php?mod=lightbox&mod_action=lb_editconfig&pid={$pid}"); ?>"> <input type="hidden" name="action" value="update" /> @@ -84,7 +82,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Individual Page - Album Tab Header');?></b><?php echo help_link('lb_al_head_links', $this->getName()); ?><br /> <?php print i18n::translate('Link appearance');?></td> <td class="optionbox"> - <select name="NEW_LB_AL_HEAD_LINKS" tabindex="<?php $i++; print $i?>"> + <select name="NEW_LB_AL_HEAD_LINKS"> <option value="icon" <?php if ($LB_AL_HEAD_LINKS=="icon") print "selected=\"selected\""; ?>><?php print i18n::translate('Icon');?></option> <option value="text" <?php if ($LB_AL_HEAD_LINKS=="text") print "selected=\"selected\""; ?>><?php print i18n::translate('Text');?></option> <option value="both" <?php if ($LB_AL_HEAD_LINKS=="both") print "selected=\"selected\""; ?>><?php print i18n::translate('Both');?></option> @@ -98,7 +96,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Individual Page - Album Tab Thumbnail - Notes Tooltip');?></b><?php echo help_link('lb_tt_balloon', $this->getName()); ?><br /> <?php print i18n::translate('Notes - Tooltip appearance');?></td> - <td class="optionbox"><select name="NEW_LB_TT_BALLOON" tabindex="<?php $i++; print $i?>"> + <td class="optionbox"><select name="NEW_LB_TT_BALLOON"> <option value="true" <?php if ($LB_TT_BALLOON=="true") print "selected=\"selected\""; ?>><?php print i18n::translate('Balloon');?></option> <option value="false" <?php if ($LB_TT_BALLOON=="false") print "selected=\"selected\""; ?>><?php print i18n::translate('Normal');?></option> </select> @@ -111,7 +109,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Individual Page - Album Tab Thumbnails');?></b><?php echo help_link('lb_al_thumb_links', $this->getName()); ?><br /> <?php print i18n::translate('Link appearance');?></td> - <td class="optionbox"><select name="NEW_LB_AL_THUMB_LINKS" tabindex="<?php $i++; print $i?>"> + <td class="optionbox"><select name="NEW_LB_AL_THUMB_LINKS"> <option value="icon" <?php if ($LB_AL_THUMB_LINKS=="icon") print "selected=\"selected\""; ?>><?php print i18n::translate('Icon');?></option> <option value="text" <?php if ($LB_AL_THUMB_LINKS=="text") print "selected=\"selected\""; ?>><?php print i18n::translate('Text');?></option> </select> @@ -124,7 +122,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Slide Show speed');?></b><?php echo help_link('lb_ss_speed', $this->getName()); ?></td> - <td class="optionbox"><select name="NEW_LB_SS_SPEED" tabindex="<?php $i++; print $i?>"> + <td class="optionbox"><select name="NEW_LB_SS_SPEED"> <option value= "2" <?php if ($LB_SS_SPEED == 2) print "selected=\"selected\""; ?>><?php print "2";?></option> <option value= "3" <?php if ($LB_SS_SPEED == 3) print "selected=\"selected\""; ?>><?php print "3";?></option> <option value= "4" <?php if ($LB_SS_SPEED == 4) print "selected=\"selected\""; ?>><?php print "4";?></option> @@ -148,7 +146,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Slideshow sound track'); ?></b><?php echo help_link('lb_music_file', $this->getName()); ?><br /> <?php print i18n::translate('(mp3 only)'); ?></td> <td class="optionbox"> - <input type="text" name="NEW_LB_MUSIC_FILE" value="<?php print $LB_MUSIC_FILE;?>" size="60" tabindex="<?php $i++; print $i?>" /><br /> + <input type="text" name="NEW_LB_MUSIC_FILE" value="<?php print $LB_MUSIC_FILE;?>" size="60" /><br /> <?php print i18n::translate('Location of sound track file (Leave blank for no sound track)');?> </td> </tr> @@ -157,7 +155,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Image Transition speed');?></b><?php echo help_link('lb_transition', $this->getName()); ?></td> - <td class="optionbox"><select name="NEW_LB_TRANSITION" tabindex="<?php $i++; print $i?>"> + <td class="optionbox"><select name="NEW_LB_TRANSITION"> <option value="none" <?php if ($LB_TRANSITION=="none") print "selected=\"selected\""; ?>><?php print i18n::translate('None');?></option> <option value="normal" <?php if ($LB_TRANSITION=="normal") print "selected=\"selected\""; ?>><?php print i18n::translate('Normal');?></option> <option value="double" <?php if ($LB_TRANSITION=="double") print "selected=\"selected\""; ?>><?php print i18n::translate('Double');?></option> @@ -172,10 +170,10 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('URL Window dimensions');?><b><?php echo help_link('lb_url_dimensions', $this->getName()); ?></td> <td class="optionbox"> - <input type="text" name="NEW_LB_URL_WIDTH" value="<?php print $LB_URL_WIDTH;?>" size="4" tabindex="<?php $i++; print $i?>" /> + <input type="text" name="NEW_LB_URL_WIDTH" value="<?php print $LB_URL_WIDTH;?>" size="4" /> <?php print i18n::translate('Width');?> - <input type="text" name="NEW_LB_URL_HEIGHT" value="<?php print $LB_URL_HEIGHT;?>" size="4" tabindex="<?php $i++; print $i?>" /> + <input type="text" name="NEW_LB_URL_HEIGHT" value="<?php print $LB_URL_HEIGHT;?>" size="4" /> <?php print i18n::translate('Height');?><br /> <?php print i18n::translate('Width and height of URL window in pixels');?> </td> @@ -188,7 +186,7 @@ $i = 0; <tr> <td class="descriptionbox"><b><?php print i18n::translate('Multimedia Page - Thumbnails');?></b><?php echo help_link('lb_ml_thumb_links', $this->getName()); ?><br /> <?php print i18n::translate('Link appearance');?></td> <td class="optionbox"> - <select name="NEW_LB_ML_THUMB_LINKS" tabindex="<?php $i++; print $i?>"> + <select name="NEW_LB_ML_THUMB_LINKS"> <option value= "none" <?php if ($LB_ML_THUMB_LINKS == "none") print "selected=\"selected\""; ?>><?php print i18n::translate('None');?></option> <option value= "text" <?php if ($LB_ML_THUMB_LINKS == "text") print "selected=\"selected\""; ?>><?php print i18n::translate('Text');?></option> <option value= "icon" <?php if ($LB_ML_THUMB_LINKS == "icon") print "selected=\"selected\""; ?>><?php print i18n::translate('Icon');?></option> @@ -210,9 +208,9 @@ $i = 0; <tr> <td class="descriptionbox" colspan="2" align="center"> - <input type="submit" tabindex="<?php $i++; print $i?>" value="<?php print i18n::translate('Save configuration');?>" onclick="closeHelp();" /> + <input type="submit" value="<?php print i18n::translate('Save configuration');?>" onclick="closeHelp();" /> - <input type="reset" tabindex="<?php $i++; print $i?>" value="<?php print i18n::translate('Reset');?>" /> + <input type="reset" value="<?php print i18n::translate('Reset');?>" /> <?php if ($pid){ ?> <INPUT TYPE="button" VALUE="<?php print i18n::translate('Return to Album page');?>" onclick="javascript:window.location='individual.php?pid=<?php echo $pid;?>&gedcom=<?php echo $GEDCOM;?>&tab=lightbox'" /> diff --git a/modules/login_block/module.php b/modules/login_block/module.php index b8a0fa0e82..ffbecea9a6 100644 --- a/modules/login_block/module.php +++ b/modules/login_block/module.php @@ -51,17 +51,14 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { if (WT_USER_ID) { $title = i18n::translate('Logout'); - $i = 0; // Initialize tab index $content = '<div class="center"><form method="post" action="index.php?logout=1" name="logoutform" onsubmit="return true;">'; $content .= '<br /><a href="edituser.php" class="name2">'.i18n::translate('Logged in as ').' ('.WT_USER_NAME.')</a><br /><br />'; - $i++; - $content .= "<input type=\"submit\" tabindex=\"{$i}\" value=\"".i18n::translate('Logout')."\" />"; + $content .= "<input type=\"submit\" value=\"".i18n::translate('Logout')."\" />"; $content .= "<br /><br /></form></div>"; } else { - $i = 0; // Initialize tab index $title = i18n::translate('Login'); if (get_site_setting('USE_REGISTRATION_MODULE')) { $title.=help_link('index_login_register'); @@ -82,7 +79,6 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= "<table class=\"center tabs_table\">"; // Row 1: Userid - $i++; $content .= "<tr><td "; $content .= write_align_with_textdir_check("right", true); $content .= " class=\"{$TEXT_DIRECTION} wrap width50\">"; @@ -90,11 +86,10 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= help_link('username'); $content .= "</td><td "; $content .= write_align_with_textdir_check("left", true); - $content .= " class=\"{$TEXT_DIRECTION}\"><input type=\"text\" tabindex=\"{$i}\" name=\"username\" size=\"20\" class=\"formField\" />"; + $content .= " class=\"{$TEXT_DIRECTION}\"><input type=\"text\" name=\"username\" size=\"20\" class=\"formField\" />"; $content .= "</td></tr>"; // Row 2: Password - $i++; $content .= "<tr><td "; $content .= write_align_with_textdir_check("right", true); $content .= " class=\"{$TEXT_DIRECTION} wrap width50\">"; @@ -102,19 +97,17 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= help_link('password'); $content .= "</td><td "; $content .= write_align_with_textdir_check("left", true); - $content .= " class=\"{$TEXT_DIRECTION}\"><input type=\"password\" tabindex=\"{$i}\" name=\"password\" size=\"20\" class=\"formField\" />"; + $content .= " class=\"{$TEXT_DIRECTION}\"><input type=\"password\" name=\"password\" size=\"20\" class=\"formField\" />"; $content .= "</td></tr>"; // Row 3: "Login" link - $i++; $content .= "<tr><td colspan=\"2\" class=\"center\">"; - $content .= "<input type=\"submit\" tabindex=\"{$i}\" value=\"".i18n::translate('Login')."\" /> "; + $content .= "<input type=\"submit\" value=\"".i18n::translate('Login')."\" /> "; $content .= "</td></tr>"; if (get_site_setting('USE_REGISTRATION_MODULE')) { // Row 4: "Request Account" link - $i++; $content .= "<tr><td "; $content .= write_align_with_textdir_check("right", true); $content .= " class=\"{$TEXT_DIRECTION} wrap width50\"><br />"; @@ -123,13 +116,12 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= "</td><td "; $content .= write_align_with_textdir_check("left", true); $content .= " class=\"{$TEXT_DIRECTION}\"><br />"; - $content .= "<a href=\"login_register.php?action=register\" tabindex=\"{$i}\">"; + $content .= "<a href=\"login_register.php?action=register\">"; $content .= i18n::translate('Request new user account'); $content .= "</a>"; $content .= "</td></tr>"; // Row 5: "Lost Password" link - $i++; $content .= "<tr><td "; $content .= write_align_with_textdir_check("right", true); $content .= " class=\"{$TEXT_DIRECTION} wrap width50\">"; @@ -138,7 +130,7 @@ class login_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= "</td><td "; $content .= write_align_with_textdir_check("left", true); $content .= " class=\"{$TEXT_DIRECTION}\">"; - $content .= "<a href=\"login_register.php?action=pwlost\" tabindex=\"{$i}\">"; + $content .= "<a href=\"login_register.php?action=pwlost\">"; $content .= i18n::translate('Request new password'); $content .= "</a>"; $content .= "</td></tr>"; |
