OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

discarded 'Reset' buttons; harmonized button labels

Browse Source
This commit is contained in:
following
2013-04-26 15:27:13 +02:00
parent e39e11b5d1
commit 3aa3eb6dc4
27 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/doc/sql/static-data/data.sql
View File

@ -2435,6 +2435,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1993', 'Opencac
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1994', 'Opencaching at Google+', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1995', 'Opencaching at Twitter', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1996', 'The visited website <b>%1</b> does not exists, we found the following suitable pages:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1998', 'OK', '2013-04-25 23:00:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -6202,6 +6203,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1994', 'DE', 'Opencaching bei Google+', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1995', 'DE', 'Opencaching bei Twitter', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1996', 'DE', 'Die gesuchte Webseite <b>%1</b> existiert nicht, aber wir haben folgende geeignete Seiten gefunden:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1997', 'DE', 'OK', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');

2
htdocs/editcache.php
View File

@ -867,7 +867,7 @@ function getWaypoints($cacheid)
tpl_set_var('wp_gc', htmlspecialchars($wp_gc, ENT_COMPAT, 'UTF-8'));
tpl_set_var('wp_nc', htmlspecialchars($wp_nc, ENT_COMPAT, 'UTF-8'));
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
}
else

2
htdocs/editdesc.php
View File

@ -260,7 +260,7 @@
tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
// Text / normal HTML / HTML editor

2
htdocs/editlog.php
View File

@ -298,7 +298,7 @@
tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
tpl_set_var('cacheid', $log_record['cache_id']);
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
tpl_set_var('logid', $log_id);
tpl_set_var('date_message', !$date_ok ? $date_message : '');

2
htdocs/lang/de/expressions.inc.php
View File

@ -25,7 +25,7 @@
//common vars
$dateformat = $opt['locale'][$locale]['format']['date'];
$reset = t('Reset');
$reset = t('Reset'); // obsolete
$yes = t('Yes');
$no = t('No');

2
htdocs/lang/de/ocstyle/editcache.inc.php
View File

@ -15,7 +15,7 @@
****************************************************************************/
$submit = t('Change');
$submit = t('Save');
$remove = t('Delete');
$edit = t('Edit');

2
htdocs/lang/de/ocstyle/editcache.tpl.php
View File

@ -359,7 +359,7 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submit" value="{submit}" class="formbutton" onclick="submitbutton('submit')" />
</td>
</tr>

2
htdocs/lang/de/ocstyle/editdesc.inc.php
View File

@ -26,5 +26,5 @@
$pictureline = '<td><a href="javascript:SelectFile(\'{link}\');">{title}<br/><img src="{link}" width="180"></a></td>';
$picturelines = '{lines}';
$submit = t('Change');
$submit = t('Save');
?>

2
htdocs/lang/de/ocstyle/editdesc.tpl.php
View File

@ -107,7 +107,7 @@
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform')" />
</td>
</tr>

2
htdocs/lang/de/ocstyle/editlog.inc.php
View File

@ -15,7 +15,7 @@
****************************************************************************/
$submit = t('Change');
$submit = t('Save');
$error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');

2
htdocs/lang/de/ocstyle/editlog.tpl.php
View File

@ -155,7 +155,7 @@ function _chkFound () {
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform')" />
</td>
</tr>

2
htdocs/lang/de/ocstyle/log_cache.tpl.php
View File

@ -150,7 +150,7 @@ function _chkFound () {
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform')" />
</td>
</tr>

2
htdocs/lang/de/ocstyle/newcache.tpl.php
View File

@ -399,7 +399,7 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform') "/>
</td>
</tr>

2
htdocs/lang/de/ocstyle/newdesc.tpl.php
View File

@ -103,7 +103,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{reset}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform')" />
</td>
</tr>

2
htdocs/log.php
View File

@ -301,7 +301,7 @@
tpl_set_var('loghour', htmlspecialchars($log_time_hour, ENT_COMPAT, 'UTF-8'));
tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
tpl_set_var('logtypeoptions', $logtypeoptions);
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
tpl_set_var('date_message', '');

2
htdocs/newcache.php
View File

@ -46,7 +46,7 @@
require_once($stylepath . '/' . $tplname . '.inc.php');
//set template replacements
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
tpl_set_var('general_message', '');
tpl_set_var('hidden_since_message', '');

2
htdocs/newdesc.php
View File

@ -216,7 +216,7 @@
tpl_set_var('descMode', 3);
}
tpl_set_var('reset', $reset);
tpl_set_var('reset', $reset); // obsolete
tpl_set_var('submit', $submit);
}
else

2
htdocs/templates2/ocstyle/activation.tpl
View File

@ -66,7 +66,7 @@
{/if}
<p style="line-height: 1.6em;">
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submit" value="{t}Submit{/t}" class="formbutton" onclick="submitbutton('submit')" />
</p>
</form>

2
htdocs/templates2/ocstyle/login.tpl
View File

@ -54,7 +54,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="submit" value="{t}Login{/t}" class="formbutton" onclick="submitbutton('submit')" />
</td>
</tr>

2
htdocs/templates2/ocstyle/mailto.tpl
View File

@ -86,7 +86,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp;
<!-- <input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp; -->
<input type="submit" name="ok" value="{t}Send{/t}" class="formbutton" onclick="submitbutton('ok')" />
</td>
</tr>

2
htdocs/templates2/ocstyle/map2.tpl
View File

@ -2185,7 +2185,7 @@ function toggle_attribselection(bSaveCookies)
{/if}
<tr><td>{t}Cache icons{/t}:</td><td><select name="opt_cacheicons"><option id="opt_cacheicons1" value="1">{t}classic OC{/t}<option id="opt_cacheicons2" value="2">{t}OKAPI style{/t}</option></select></td></tr>
<tr><td>{t 1=$help_previewpics}Show %1preview pictures</a><br />(% of map area, 0=off){/t}:</td><td><input type="text" id="opt_pictures" name="opt_pictures" size="2" maxlength="2" /></td></tr>
<tr><td colspan="2">{if $login.userid>0}<input type="button" class="formbutton" value="{t}Cancel{/t}" onclick="toggle_settings()"/>&nbsp; <input type="submit" name="submitsettings" class="formbutton" value="{t}Change{/t}" onclick="submitbutton('submitsettings')" />{else}<em>{t}You must be logged in to change map settings.{/t}</em>{/if}</td></tr>
<tr><td colspan="2">{if $login.userid>0}<input type="button" class="formbutton" value="{t}Cancel{/t}" onclick="toggle_settings()"/>&nbsp; <input type="submit" name="submitsettings" class="formbutton" value="{t}OK{/t}" onclick="submitbutton('submitsettings')" />{else}<em>{t}You must be logged in to change map settings.{/t}</em>{/if}</td></tr>
</table>
</form>
</div>

4
htdocs/templates2/ocstyle/mywatches.tpl
View File

@ -92,8 +92,8 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp;
<input type="submit" name="ok" value="{t}Change{/t}" class="formbutton" onclick="submitbutton('ok')" />
<!-- <input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp; -->
<input type="submit" name="ok" value="{t}Save{/t}" class="formbutton" onclick="submitbutton('ok')" />
</td>
</tr>
</table>

3
htdocs/templates2/ocstyle/newemail.tpl
View File

@ -103,8 +103,9 @@
<tr><td class="spacer" colspan="2"></td></tr>
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td>&nbsp;</td>
<td class="header-small" colspan="2">
<input type="reset" name="clear" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('clear')" />&nbsp;&nbsp;
<!-- <input type="reset" name="clear" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('clear')" />&nbsp;&nbsp; -->
<input type="submit" name="confirm" value="{t}Change{/t}" class="formbutton" onclick="submitbutton('confirm ')" />
</td>
</tr>

3
htdocs/templates2/ocstyle/newpw.tpl
View File

@ -113,8 +113,9 @@
<tr><td class="spacer" colspan="2"></td></tr>
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td>&nbsp;</td>
<td class="header-small" colspan="2">
<input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp;
<!-- <input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" />&nbsp;&nbsp; -->
<input type="submit" name="changepw" value="{t}Change{/t}" class="formbutton" onclick="submitbutton('changepw')" />
</td>
</tr>

2
htdocs/templates2/ocstyle/picture.tpl
View File

@ -135,7 +135,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')" />&nbsp;&nbsp; -->
<input type="submit" name="ok" value="{if $action=='add'}{t}Upload{/t}{else}{t}Submit{/t}{/if}" class="formbutton" onclick="submitbutton('ok')" />
</td>
</tr>

2
htdocs/templates2/ocstyle/register.tpl
View File

@ -190,7 +190,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')"/>&nbsp;&nbsp;
<!-- <input type="reset" name="reset" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('reset')"/>&nbsp;&nbsp; -->
<input type="submit" name="submit" value="{t}Register{/t}" class="formbutton" onclick="submitbutton('submit')"/>
</td>
</tr>

2
htdocs/templates2/ocstyle/reportcache.tpl
View File

@ -87,7 +87,7 @@
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" >&nbsp;&nbsp;
<!-- <input type="reset" name="cancel" value="{t}Reset{/t}" class="formbutton" onclick="flashbutton('cancel')" >&nbsp;&nbsp; -->
<input type="submit" name="ok" value="{t}Send{/t}" class="formbutton" onclick="submitbutton('ok')" />
</td>
</tr>