summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Osborne <kiwi3685@me.com>2011-02-24 21:39:08 +0000
committerNigel Osborne <kiwi3685@me.com>2011-02-24 21:39:08 +0000
commitf7ae6818f3d4570bc240009faddc5a3bb1ba4d9e (patch)
tree3be3644c7386c09b4e20ada3ed4a1bf34afc9df2
parentbc7c0f37340fc9cd7867e17d85b7de9f266db8e2 (diff)
downloadwebtrees-f7ae6818f3d4570bc240009faddc5a3bb1ba4d9e.tar.gz
webtrees-f7ae6818f3d4570bc240009faddc5a3bb1ba4d9e.tar.bz2
webtrees-f7ae6818f3d4570bc240009faddc5a3bb1ba4d9e.zip
Add help text about multiple calendar conversion options
-rw-r--r--admin_trees_config.php2
-rw-r--r--help_text.php5
-rw-r--r--themes/_administration/style.css1
3 files changed, 6 insertions, 2 deletions
diff --git a/admin_trees_config.php b/admin_trees_config.php
index fa4576bf09..ad473d70ee 100644
--- a/admin_trees_config.php
+++ b/admin_trees_config.php
@@ -474,7 +474,7 @@ echo WT_JS_START;?>
}
?>
</select>
- <br/>
+
<select id="NEW_CALENDAR_FORMAT1" name="NEW_CALENDAR_FORMAT1">
<?php
foreach (array(
diff --git a/help_text.php b/help_text.php
index 81d1821457..e6ea8b372c 100644
--- a/help_text.php
+++ b/help_text.php
@@ -1341,7 +1341,10 @@ case 'AUTO_GENERATE_THUMBS':
case 'CALENDAR_FORMAT':
$title=WT_I18N::translate('Calendar format');
- $text=WT_I18N::translate('Dates can be recorded in various calendars such as Gregorian, Julian, or the Jewish Calendar. This option allows you to convert dates to a preferred calendar. For example, you could select Gregorian to convert Julian and Hebrew dates to Gregorian. The converted date is shown in parentheses after the regular date.<br /><br />Dates are only converted if they are valid for the calendar. For example, only dates between 22&nbsp;SEP&nbsp;1792 and 31&nbsp;DEC&nbsp;1805 will be converted to the French Republican calendar and only dates after 15&nbsp;OCT&nbsp;1582 will be converted to the Gregorian calendar.<br /><br />Hebrew is the same as Jewish, but using Hebrew characters. Arabic is the same as Hijri, but using Arabic characters.<br /><br />Note: Since the Jewish and Hijri calendar day starts at dusk, any event taking place from dusk till midnight will display as one day prior to the correct date. The display of Hebrew and Arabic can be problematic in old browsers, which may display text backwards (left to right) or not at all.');
+ $text=WT_I18N::translate('Dates can be recorded in various calendars such as Gregorian, Julian, or the Jewish Calendar. This option allows you to convert dates to a preferred calendar. For example, you could select Gregorian to convert Julian and Hebrew dates to Gregorian. The converted date is shown in parentheses after the regular date.<br /><br />Dates are only converted if they are valid for the calendar. For example, only dates between 22&nbsp;SEP&nbsp;1792 and 31&nbsp;DEC&nbsp;1805 will be converted to the French Republican calendar and only dates after 15&nbsp;OCT&nbsp;1582 will be converted to the Gregorian calendar.<br /><br />Hebrew is the same as Jewish, but using Hebrew characters. Arabic is the same as Hijri, but using Arabic characters.<br /><br />Note: Since the Jewish and Hijri calendar day starts at dusk, any event taking place from dusk till midnight will display as one day prior to the correct date. The display of Hebrew and Arabic can be problematic in old browsers, which may display text backwards (left to right) or not at all.');
+ $text .='<p>';
+ $text .= WT_I18N::translate('There are two options available for sites where it is necessary to have two calendar conversions, such as Gregorian AND Jewish.');
+ $text .='</p>';
break;
case 'CHART_BOX_TAGS':
diff --git a/themes/_administration/style.css b/themes/_administration/style.css
index 473b956e13..229c7fd35d 100644
--- a/themes/_administration/style.css
+++ b/themes/_administration/style.css
@@ -209,6 +209,7 @@ table.gedcom_table2 {background:OldLace; border:1px inset #D9D6C4; border-collap
#file-options td, #privacy td, #config-media td, #access-options td, #layout-options td, #hide-show td, #edit-options td {border-bottom:1px solid LightGrey;}
#file-options th, #privacy th, #config-media th, #access-options th, #layout-options th, #hide-show th, #edit-options th {border-bottom:2px solid LightGrey; color:green; font-weight:bold; text-align:left;}
#relatives {margin-left:120px;}
+#NEW_CALENDAR_FORMAT1 {margin:0 20px;}
/* USER LIST */
table#list {width:100%}