summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Osborne <kiwi3685@me.com>2011-01-01 23:13:59 +0000
committerNigel Osborne <kiwi3685@me.com>2011-01-01 23:13:59 +0000
commite0711ef912c97b8c5cb5e27d5e395c98804a464b (patch)
tree179f691cc9a0aec8b81fcf2352ff17a1dcf5917c
parent8742eb36ab61618492801929f35a03f4f204db53 (diff)
downloadwebtrees-e0711ef912c97b8c5cb5e27d5e395c98804a464b.tar.gz
webtrees-e0711ef912c97b8c5cb5e27d5e395c98804a464b.tar.bz2
webtrees-e0711ef912c97b8c5cb5e27d5e395c98804a464b.zip
Add "Help for this page" link
-rw-r--r--admin_media.php8
-rw-r--r--themes/_administration/images/help.jpgbin731 -> 0 bytes
-rw-r--r--themes/_administration/images/help.pngbin0 -> 1049 bytes
-rw-r--r--themes/_administration/style.css2
-rw-r--r--themes/_administration/theme.php2
5 files changed, 8 insertions, 4 deletions
diff --git a/admin_media.php b/admin_media.php
index d017bdc45b..e0dd891a43 100644
--- a/admin_media.php
+++ b/admin_media.php
@@ -306,13 +306,13 @@ if (check_media_structure()) {
// Check if Media Directory is writeable or if Media features are enabled
// If one of these is not true then do not continue
if (!dir_is_writable($MEDIA_DIRECTORY) || !$MULTI_MEDIA) {
- echo "<span class=\"error\"><b>";
+ echo "<p class=\"error\"><b>";
echo WT_I18N::translate('Uploading media files is not allowed because multi-media items have been disabled or because the media directory is not writable.');
- echo "</b></span><br />";
+ echo "</b></p>";
} else {
show_mediaUpload_form(WT_SCRIPT_NAME, $showthumb); // We have the green light to upload media, echo the form
}
- echo "</div><br />";
+ echo "</div>";
ob_start(); // Save output until action table has been printed
@@ -764,6 +764,8 @@ if (check_media_structure()) {
$savedOutput = ob_get_clean();
+ // "Help for this page" link
+ echo '<div id="page_help">', help_link('manage_media'), '</div>';
?>
<form name="managemedia" method="post" onsubmit="return checknames(this);" action="<?php echo WT_SCRIPT_NAME; ?>">
diff --git a/themes/_administration/images/help.jpg b/themes/_administration/images/help.jpg
deleted file mode 100644
index 0b8e51f764..0000000000
--- a/themes/_administration/images/help.jpg
+++ /dev/null
Binary files differ
diff --git a/themes/_administration/images/help.png b/themes/_administration/images/help.png
new file mode 100644
index 0000000000..68b7c1ff3e
--- /dev/null
+++ b/themes/_administration/images/help.png
Binary files differ
diff --git a/themes/_administration/style.css b/themes/_administration/style.css
index 2c7ecf7345..d55392f8f0 100644
--- a/themes/_administration/style.css
+++ b/themes/_administration/style.css
@@ -49,6 +49,8 @@ img {border:none;}
.indent {padding-left:15px;}
h3 {margin:0}
h4 {margin: 5px 3px; font-weight:normal; font-style:italic;}
+#page_help{text-align:right;}
+#page_help img{ height: 24px; margin: -5px; padding: 0; width: 24px;}
/* HEADER */
#admin_head {position:relative; height:70px; margin-bottom:10px; background-image: url("images/header.png"); background-repeat:no-repeat; background-position:top left;}
diff --git a/themes/_administration/theme.php b/themes/_administration/theme.php
index a64e9f44c2..baa0720058 100644
--- a/themes/_administration/theme.php
+++ b/themes/_administration/theme.php
@@ -41,7 +41,7 @@ $WT_USE_HELPIMG = true;
//- main icons
$WT_IMAGES=array(
'webtrees'=>WT_THEME_DIR.'images/webtrees_s.png',
- 'help'=>WT_THEME_DIR.'images/help.jpg',
+ 'help'=>WT_THEME_DIR.'images/help.png',
'email'=>WT_THEME_DIR.'images/email.png',
'open'=>WT_THEME_DIR.'images/open.png',
'close'=>WT_THEME_DIR.'images/close.png',