diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index 76de3040..0ddf5234 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -2391,6 +2391,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1965', 'cache d INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1966', 'as of', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1967', 'all log entries \© their authors', '2013-02-23 19:00:04'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1968', 'more', '2013-02-23 19:00:04'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1969', 'Only the green entries are visible to other users.', '2013-02-23 19:00:04'); -- Table sys_trans_ref SET NAMES 'utf8'; @@ -6060,6 +6061,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 ('1966', 'DE', 'Stand:', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1967', 'DE', 'alle Logeinträge \© jeweiliger Autor', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1968', 'DE', 'mehr', '2013-02-19 05:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1969', 'DE', 'Nur die grüne Einträge sind für andere Benutzer sichtbar.', '2013-02-19 05:48:07'); 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'); @@ -7550,6 +7552,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 ('1966', 'EN', 'as of', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1967', 'EN', 'all log entries \© their authors', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1968', 'EN', 'more', '2013-02-19 05:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1969', 'EN', 'Only the green entries are visible to other users.', '2013-02-19 05:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'ES', 'Reordenar ID', '2010-12-09 00:17:55'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'ES', 'La base de datos no se pudo conectar.', '2010-12-09 00:17:55'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'ES', 'En pruebas - por favor, no entre.', '2010-12-09 00:17:55'); @@ -12159,4 +12162,4 @@ TRUNCATE TABLE `watches_waitingtypes`; INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('1', 'ownerlog'); INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('2', 'cache_watches'); -INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '88114246f67a7b351ee2184d93624cc3') ON DUPLICATE KEY UPDATE `value`='88114246f67a7b351ee2184d93624cc3'; \ No newline at end of file +INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '88114246f67a7b351ee2184d93624cc3') ON DUPLICATE KEY UPDATE `value`='88114246f67a7b351ee2184d93624cc3'; diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index 43910f49..2b320aed 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -1394,6 +1394,10 @@ div#havefound { margin: 0 0 6px 0; } +.public-setting { + color: #428d1d; +} + /* RSS feeds */ #blog div.newsblock { margin-left:00px } #forum div.newsblock { margin-left:20px } diff --git a/htdocs/templates2/ocstyle/myprofile.tpl b/htdocs/templates2/ocstyle/myprofile.tpl index f460fcfa..d796a785 100644 --- a/htdocs/templates2/ocstyle/myprofile.tpl +++ b/htdocs/templates2/ocstyle/myprofile.tpl @@ -19,16 +19,16 @@

{t}The following informations are stored in your userprofile:{/t}
- {t}Gray entries will be hidden to other users.{/t} + {t}Only the green entries are visible to other users.{/t}

- - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + @@ -149,8 +141,8 @@ @@ -186,8 +176,8 @@ - - + + {if $errorUnknown==true} @@ -219,7 +209,7 @@ {/if} {if $edit==true} - + {/if} - {foreach from=$useroptions item=optionItem}
{t}Username:{/t} + {t}Username:{/t} {if $edit==true} - + {if $usernameErrorInvalidChars==true} {t}The username is not valid.{/t} {elseif $errorUsernameExist==true} @@ -42,49 +42,45 @@
{t}E-Mail-Address:{/t}{$email|escape}{t}E-Mail-Address:{/t}{$email|escape}
{t}First name:{/t} - - {if $edit==true} - - {if $firstNameError==true} - {t}The first name is not valid.{/t} - {/if} - {else} - {$firstName|escape} - {/if} - -
{t}Last name:{/t} - - {if $edit==true} - - {if $lastNameError==true} - {t}The last name is not valid.{/t} - {/if} - {else} - {$lastName|escape} - {/if} - -
{t}Country:{/t}{t}First name:{/t} {if $edit==true} - + {if $firstNameError==true} + {t}The first name is not valid.{/t} + {/if} + {else} + {$firstName|escape} + {/if} +
{t}Last name:{/t} + {if $edit==true} + + {if $lastNameError==true} + {t}The last name is not valid.{/t} + {/if} + {else} + {$lastName|escape} + {/if} +
{t}Country:{/t} + {if $edit==true} +
{t}Home coordinates:{/t}{t}Home coordinates:{/t} - - {if $edit==true} - {coordinput prefix="coord" lat=$coordsDecimal.lat lon=$coordsDecimal.lon} - {else} - {$coords.lat|escape} {$coords.lon|escape} - {/if} - + {if $edit==true} + {coordinput prefix="coord" lat=$coordsDecimal.lat lon=$coordsDecimal.lon} + {else} + {$coords.lat|escape} {$coords.lon|escape} + {/if}
{t}Notifications:{/t}{t}Notifications:{/t} - - {if $edit==true} - {capture name=inputfield} - - {/capture} - {t 1=$smarty.capture.inputfield}I want to be notified about new Geocaches within an radius of %1 km.{/t}
- - - {t}The notification radius must be not more than 150 km. To deaktivate notifications, set the radius to 0.{/t} - - {if $notifyRadiusError==true} - {t}The entered radius is not valid.{/t} - {/if} - {else} - {if $notifyRadius>0} - {t 1=$notifyRadius|escape}Notify about new Geocaches in a radius of %1 km.{/t} - {else} - {t}Notification about new Geocaches is not activated.{/t} - {/if} + {if $edit==true} + {capture name=inputfield} + + {/capture} + {t 1=$smarty.capture.inputfield}I want to be notified about new Geocaches within an radius of %1 km.{/t}
+ + + {t}The notification radius must be not more than 150 km. To deaktivate notifications, set the radius to 0.{/t} + + {if $notifyRadiusError==true} + {t}The entered radius is not valid.{/t} {/if} - + {else} + {if $notifyRadius>0} + {t 1=$notifyRadius|escape}Notify about new Geocaches in a radius of %1 km.{/t} + {else} + {t}Notification about new Geocaches is not activated.{/t} + {/if} + {/if}
{t}Others:{/t} {if $edit==true} - - + +
{else} {if $usePMR==true} @@ -159,26 +151,24 @@ {/if} {if $edit==true} -
+
- - {t}Attention: If you are using this option, don't forget to log out before other persons can use your computer. - Otherwise, they can use and modify your personal data.{/t} - + {t}Attention: If you are using this option, don't forget to log out before other persons can use your computer. + Otherwise, they can use and modify your personal data.{/t}
{else} {if $permanentLogin==true} -
  • {t}Don't log me out after 15 minutes inaktivity.{/t}
    • +
  • {t}Don't log me out after 15 minutes inaktivity.{/t}
    • {/if} {/if} {if $edit==true} - +
    {else} {if $useHTMLEditor==true} -
  • {t}Don't use an HTML editor by default.{/t}
    • +
  • {t}Don't use an HTML editor by default.{/t}
    • {/if} {/if}
    {t}Registered since{/t}:{$registeredSince|date_format:$opt.format.datelong}{t}Registered since{/t}:{$registeredSince|date_format:$opt.format.datelong}
     
       diff --git a/htdocs/templates2/ocstyle/start.tpl b/htdocs/templates2/ocstyle/start.tpl index 65d201c6..06663bcb 100644 --- a/htdocs/templates2/ocstyle/start.tpl +++ b/htdocs/templates2/ocstyle/start.tpl @@ -6,7 +6,7 @@
    -

    {$message}

    +

    {$message}

     
    diff --git a/htdocs/templates2/ocstyle/viewprofile.tpl b/htdocs/templates2/ocstyle/viewprofile.tpl index aa700506..0f786359 100644 --- a/htdocs/templates2/ocstyle/viewprofile.tpl +++ b/htdocs/templates2/ocstyle/viewprofile.tpl @@ -72,7 +72,6 @@     		{t}unknown{/t}