summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin_module_blocks.php4
-rw-r--r--admin_module_menus.php6
-rw-r--r--admin_module_reports.php4
-rw-r--r--admin_module_sidebar.php6
-rw-r--r--admin_module_tabs.php6
-rw-r--r--admin_site_logs.php6
-rw-r--r--admin_users.php4
-rw-r--r--modules/faq/module.php2
-rw-r--r--themes/_administration/style.css2
9 files changed, 21 insertions, 19 deletions
diff --git a/admin_module_blocks.php b/admin_module_blocks.php
index 11fb50c6a7..3314bca700 100644
--- a/admin_module_blocks.php
+++ b/admin_module_blocks.php
@@ -145,7 +145,7 @@ print_header(WT_I18N::translate('Module administration'));
$order = 1;
foreach (WT_Module::getInstalledBlocks() as $module) { ?>
<tr>
- <td><?php echo $module->getTitle(); ?></td>
+ <td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getTitle(); ?></td>
<td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getDescription(); ?></td>
<td>
<table class="modules_table2">
@@ -158,7 +158,7 @@ print_header(WT_I18N::translate('Module administration'));
if ($access_level===null) {
$access_level=$module->defaultAccessLevel();
}
- echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>';
+ echo '<tr><td>', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td><td>';
echo edit_field_access_level($varname, $access_level);
}
?>
diff --git a/admin_module_menus.php b/admin_module_menus.php
index 61b190898c..57016cd099 100644
--- a/admin_module_menus.php
+++ b/admin_module_menus.php
@@ -166,9 +166,9 @@ echo WT_JS_START; ?>
$order = 1;
foreach (WT_Module::getInstalledMenus() as $module) { ?>
<tr class="sortme">
- <td><?php echo $module->getTitle(); ?></td>
+ <td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getTitle(); ?></td>
<td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getDescription(); ?></td>
- <td><input type="text" size="5" value="<?php echo $order; ?>" name="menuorder-<?php echo $module->getName(); ?>" />
+ <td><input type="text" size="3" value="<?php echo $order; ?>" name="menuorder-<?php echo $module->getName(); ?>" />
</td>
<td>
<table class="modules_table2">
@@ -181,7 +181,7 @@ echo WT_JS_START; ?>
if ($access_level===null) {
$access_level=$module->defaultAccessLevel();
}
- echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>';
+ echo '<tr><td>', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td><td>';
echo edit_field_access_level($varname, $access_level);
}
?>
diff --git a/admin_module_reports.php b/admin_module_reports.php
index 303d213393..6974da3e69 100644
--- a/admin_module_reports.php
+++ b/admin_module_reports.php
@@ -145,7 +145,7 @@ print_header(WT_I18N::translate('Module administration'));
$order = 1;
foreach (WT_Module::getInstalledReports() as $module) { ?>
<tr>
- <td><?php echo $module->getTitle(); ?></td>
+ <td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getTitle(); ?></td>
<td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getDescription(); ?></td>
<td>
<table class="modules_table2">
@@ -158,7 +158,7 @@ print_header(WT_I18N::translate('Module administration'));
if ($access_level===null) {
$access_level=$module->defaultAccessLevel();
}
- echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>';
+ echo '<tr><td>', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td><td>';
echo edit_field_access_level($varname, $access_level);
}
?>
diff --git a/admin_module_sidebar.php b/admin_module_sidebar.php
index b2196dc779..c2cd12afdb 100644
--- a/admin_module_sidebar.php
+++ b/admin_module_sidebar.php
@@ -166,9 +166,9 @@ echo WT_JS_START; ?>
$order = 1;
foreach (WT_Module::getInstalledSidebars() as $module) { ?>
<tr class="sortme">
- <td><?php echo $module->getTitle(); ?></td>
+ <td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getTitle(); ?></td>
<td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getDescription(); ?></td>
- <td><input type="text" size="5" value="<?php echo $order; ?>" name="sidebarorder-<?php echo $module->getName(); ?>" />
+ <td><input type="text" size="3" value="<?php echo $order; ?>" name="sidebarorder-<?php echo $module->getName(); ?>" />
</td>
<td>
<table class="modules_table2">
@@ -181,7 +181,7 @@ echo WT_JS_START; ?>
if ($access_level===null) {
$access_level=$module->defaultAccessLevel();
}
- echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>';
+ echo '<tr><td>', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td><td>';
echo edit_field_access_level($varname, $access_level);
}
?>
diff --git a/admin_module_tabs.php b/admin_module_tabs.php
index 3c7aed6792..f78cc2e2ae 100644
--- a/admin_module_tabs.php
+++ b/admin_module_tabs.php
@@ -166,9 +166,9 @@ echo WT_JS_START; ?>
$order = 1;
foreach (WT_Module::getInstalledTabs() as $module) { ?>
<tr class="sortme">
- <td><?php echo $module->getTitle(); ?></td>
+ <td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getTitle(); ?></td>
<td class="<?php echo $TEXT_DIRECTION; ?>" ><?php echo $module->getDescription(); ?></td>
- <td><input type="text" size="5" value="<?php echo $order; ?>" name="taborder-<?php echo $module->getName(); ?>" />
+ <td><input type="text" size="3" value="<?php echo $order; ?>" name="taborder-<?php echo $module->getName(); ?>" />
</td>
<td>
<table class="modules_table2">
@@ -181,7 +181,7 @@ echo WT_JS_START; ?>
if ($access_level===null) {
$access_level=$module->defaultAccessLevel();
}
- echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>';
+ echo '<tr><td>', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td><td>';
echo edit_field_access_level($varname, $access_level);
}
?>
diff --git a/admin_site_logs.php b/admin_site_logs.php
index b403f7d911..762436b05e 100644
--- a/admin_site_logs.php
+++ b/admin_site_logs.php
@@ -3,7 +3,7 @@
* Log viewer.
*
* webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
+ * Copyright (C) 2011 webtrees development team.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -226,7 +226,7 @@ $url=
$gedc_array=array();
foreach (get_all_gedcoms() as $ged_name) {
- $gedc_array[$ged_name]=$ged_name;
+ $gedc_array[$ged_name]=WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title'));
}
echo
@@ -237,7 +237,7 @@ echo
'<tr>',
'<td>',
// I18N: %s are both user-input date fields
- WT_I18N::translate('From %s to %s', '<input name="from" size="8" value="'.htmlspecialchars($from).'" /><br /><br />', '&nbsp;&nbsp;&nbsp;<input name="to" size="8" value="'.htmlspecialchars($to).'" />'),
+ WT_I18N::translate('From %s to %s', '<input name="from" size="8" value="'.htmlspecialchars($from).'" /><br /><br />', '&nbsp;<input name="to" size="8" value="'.htmlspecialchars($to).'" />'),
'</td>',
'<td>',
WT_I18N::translate('Type'), '<br />', select_edit_control('type', array(''=>'', 'auth'=>'auth','config'=>'config','debug'=>'debug','edit'=>'edit','error'=>'error','media'=>'media','search'=>'search'), null, $type, ''),
diff --git a/admin_users.php b/admin_users.php
index aec8887719..7971a15f8e 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -363,7 +363,7 @@ if ($action=="edituser") {
<?php
foreach ($all_gedcoms as $ged_id=>$ged_name) {
echo '<tr>',
- '<td>', $ged_name, '</td>',
+ '<td >', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</td>',
//Pedigree root person
'<td>';
$varname='rootid'.$ged_id;
@@ -642,7 +642,7 @@ ob_start();
}
$uged = get_user_gedcom_setting($user_id, $ged_id, 'gedcomid');
if ($uged) {
- echo ' <a href="individual.php?pid=', $uged, '&amp;ged=', rawurlencode($ged_name), '">', $ged_name, '</a></li>';
+ echo ' <a href="individual.php?pid=', $uged, '&amp;ged=', rawurlencode($ged_name), '">', WT_I18N::translate('%s', get_gedcom_setting($ged_id, 'title')), '</a></li>';
} else {
echo ' ', $ged_name, '</li>';
}
diff --git a/modules/faq/module.php b/modules/faq/module.php
index 55b7571f0e..46624f3cbb 100644
--- a/modules/faq/module.php
+++ b/modules/faq/module.php
@@ -195,7 +195,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
echo '</td><td>';
echo '<select name="gedcom_id" tabindex="4" />';
echo '<option value="">', WT_I18N::translate('All'), '</option>';
- echo '<option value="', WT_GED_ID, '" selected="selected">', htmlspecialchars(WT_GEDCOM), '</option';
+ echo '<option value="', WT_GED_ID, '" selected="selected">', WT_I18N::translate('%s', get_gedcom_setting(WT_GED_ID, 'title')), '</option';
echo '</select>';
echo '</td></tr>';
echo '</table>';
diff --git a/themes/_administration/style.css b/themes/_administration/style.css
index 0b20f7ebd4..baeed559da 100644
--- a/themes/_administration/style.css
+++ b/themes/_administration/style.css
@@ -269,7 +269,9 @@ table.upload_media {border-collapse:separate; border-spacing:0; margin:10px 0;}
table.modules_table {background:OldLace; border:1px inset #D9D6C4; border-collapse:separate; border-spacing:0; padding:5px; margin-bottom:10px;}
.modules_table th {border-bottom:2px solid LightGrey; font-weight:bold; font-size:105%;}
.modules_table td {border-bottom:2px solid LightGrey; padding:3px; min-width:120px;}
+.modules_table td+td+td {min-width:60px;}
.modules_table .modules_table2 td {border:0;}
+.modules_table2 td+td {min-width:120px;}
/* CONFIG ALBUM MODULE */
table#album_config {background:OldLace; border:1px inset #D9D6C4; border-collapse:separate; border-spacing:0; margin:10px 0;}