summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Osborne <kiwi3685@me.com>2011-01-02 23:10:10 +0000
committerNigel Osborne <kiwi3685@me.com>2011-01-02 23:10:10 +0000
commit7e43ca565bd5d54df13b48338633087adb9db9d1 (patch)
tree096190b30065c2578afd63c2b49646908fffd080
parentc809a8fde8ceb356fb926162d823773769838a80 (diff)
downloadwebtrees-7e43ca565bd5d54df13b48338633087adb9db9d1.tar.gz
webtrees-7e43ca565bd5d54df13b48338633087adb9db9d1.tar.bz2
webtrees-7e43ca565bd5d54df13b48338633087adb9db9d1.zip
Re-design for admin_site_ipaddress.php
-rw-r--r--admin_site_ipaddress.php70
-rw-r--r--themes/_administration/style.css10
2 files changed, 37 insertions, 43 deletions
diff --git a/admin_site_ipaddress.php b/admin_site_ipaddress.php
index bc6b628d7b..8cabaa8ddf 100644
--- a/admin_site_ipaddress.php
+++ b/admin_site_ipaddress.php
@@ -131,13 +131,11 @@ function showSite(siteID) {
<?php
// Search Engine IP address table
-echo '<table>',
+echo '<table class="sites">',
'<tr><td>',
'<form name="searchengineform" action="', WT_SCRIPT_NAME, '" method="post">',
'<table>',
- '<tr>',
- '<td><h3>', WT_I18N::translate('Manually mark Search Engines by IP'). help_link('help_manual_search_engines'), '</h3></td>',
- '</tr>',
+ '<tr><th>', WT_I18N::translate('Manually mark Search Engines by IP'). help_link('help_manual_search_engines'), '</th></tr>',
'<tr>',
'<td>',
'<table>';
@@ -164,42 +162,34 @@ echo '<table>',
$errorSearch = '';
}
echo '</table></td></tr></table></form></td></tr></table>';
-?>
-<!-- Banned IP address table -->
-<table>
-<tr>
- <td>
- <form name="banIPform" action="<?php echo WT_SCRIPT_NAME; ?>" method="post">
- <table>
- <tr>
- <td>
- <h3><?php echo WT_I18N::translate('Ban Sites by IP').help_link('help_banning'); ?></h3>
- </td>
- </tr>
- <tr>
- <td>
- <table>
-<?php
-$sql="SELECT ip_address, comment FROM `##ip_address` WHERE category='banned' ORDER BY INET_ATON(ip_address)";
-$banned=WT_DB::prepare($sql)->fetchAssoc();
-foreach ($banned as $ip_address=>$ip_comment) {
- echo '<tr><td><span dir="ltr"><input type="text" name="address', ++$index, '" size="16" value="', $ip_address, '" readonly /></span></td>';
- echo '<td><input type="text" name="comment', ++$index, '" size="60" value="', $ip_comment, '" readonly /></td><td class="button">';
- echo '<button name="deleteBanned" value="', $ip_address, '" type="submit">', WT_I18N::translate('Remove'), '</button>';
- echo '</td></tr>';
-}
-echo '<tr><td valign="top"><span dir="ltr"><input type="text" id="txtAddIp" name="address" size="16" value="', empty($errorBanned) ? '':$address, '" /></span></td>';
-echo '<td><input type="text" id="txtAddComment" name="comment" size="60" value="" />';
-echo '<br />', WT_I18N::translate('You may enter a comment here.'), '</td><td class="button" valign="top"><input name="action" type="hidden" value="addBanned"/>';
-echo '<input type="submit" value="', WT_I18N::translate('Add'), '" />';
-echo '</td></tr>';
-if (!empty($errorBanned)) {
- echo '<tr><td colspan="2"><span class="warning">';
- echo $errorBanned;
- echo '</span></td></tr>';
- $errorBanned = '';
-}
-echo '</table></td></tr></table></form></td></tr></table>';
+// Banned IP address table
+echo '<table class="sites">',
+ '<tr><td><form name="banIPform" action="<?php echo WT_SCRIPT_NAME; ?>" method="post">',
+ '<table>',
+ '<tr><th>', WT_I18N::translate('Ban Sites by IP').help_link('help_banning'), '</th></tr>',
+ '<tr><td>',
+ '<table>';
+ $sql="SELECT ip_address, comment FROM `##ip_address` WHERE category='banned' ORDER BY INET_ATON(ip_address)";
+ $banned=WT_DB::prepare($sql)->fetchAssoc();
+ foreach ($banned as $ip_address=>$ip_comment) {
+ echo '<tr><td><span dir="ltr"><input type="text" name="address', ++$index, '" size="16" value="', $ip_address, '" readonly /></span></td>',
+ '<td><input type="text" name="comment', ++$index, '" size="60" value="', $ip_comment, '" readonly /></td><td class="button">',
+ '<button name="deleteBanned" value="', $ip_address, '" type="submit">', WT_I18N::translate('Remove'), '</button>',
+ '</td></tr>';
+ }
+ echo '<tr><td valign="top"><span dir="ltr"><input type="text" id="txtAddIp" name="address" size="16" value="', empty($errorBanned) ? '':$address, '" /></span></td>',
+ '<td><input type="text" id="txtAddComment" name="comment" size="60" value="" />',
+ '<br />', WT_I18N::translate('You may enter a comment here.'), '</td><td class="button" valign="top"><input name="action" type="hidden" value="addBanned"/>',
+ '<input type="submit" value="', WT_I18N::translate('Add'), '" />',
+ '</td></tr>';
+
+ if (!empty($errorBanned)) {
+ echo '<tr><td colspan="2"><span class="warning">';
+ echo $errorBanned;
+ echo '</span></td></tr>';
+ $errorBanned = '';
+ }
+ echo '</table></td></tr></table></form></td></tr></table>';
print_footer();
diff --git a/themes/_administration/style.css b/themes/_administration/style.css
index e06ec7b0e5..d74056c458 100644
--- a/themes/_administration/style.css
+++ b/themes/_administration/style.css
@@ -114,9 +114,8 @@ h4 {margin: 5px 3px; font-weight:normal; font-style:italic;}
.site_config td+td {background-color:#dcdcdc; width:250px; padding:3px;} /* right/col */
/*SITE LOGS */
-.site_logs {padding: 0;}/* table */
-.site_logs td {background-color:#dcdcdc; width:250px; padding:3px; text-align:right;}
-.site_logs td+td {text-align:center;}
+table.site_logs {background:OldLace; border-collapse: separate; border-spacing: 0; border:1px inset #D9D6C4; }
+.site_logs td {width:250px; padding:5px; text-align:center;}
table#log_list {width:100%}
#log_list_length {float:left;}
#log_list_filter {float:right;}
@@ -210,3 +209,8 @@ table.upload_media {border-collapse: separate; border-spacing: 0; margin:10px 0;
.upload_media th {font-weight:bold; text-align: left;}
.upload_media td {background:OldLace; border:1px inset #D9D6C4; border-right:0; padding:5px;}
.upload_media td+td {border-left:0; padding-left:20px;}
+
+/*MANAGE SITES*/
+table.sites {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0;}
+.sites th {font-weight:bold; text-align: left;}
+.sites td {padding:5px;}