diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 0c7a6a21ed..14f9241f1b 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -37,43 +37,77 @@

{L_TITLE}

{L_EXPLAIN}

+ +
+ + - - -
{L_SELECT_IMAGE}:  
- -
-   - -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_EDIT_IMAGESET}
{L_IMAGESET_UPDATED}
{L_NO_IMAGE}
+ + + + + + + + +
{L_CURRENT_IMAGE}{L_SELECTED_IMAGE}
{L_IMAGE_PARAMETER}{L_IMAGE_VALUE}
{L_IMAGE}:
{L_DIMENSIONS}:
{L_DIMENSIONS_EXPLAIN}		 checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
  
+ + diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index f8f50fcc09..f9c159fb2e 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -421,91 +421,170 @@ pagination_sep = \'{PAGINATION_SEP}\' */ function edit_imageset($style_id) { - global $db, $template, $user, $phpbb_root_path, $cache; - - $update = (isset($_POST['submit'])) ? true : false; - - $sql = 'SELECT imageset_name, ' . $this->imageset_keys . ' - FROM ' . STYLES_IMAGE_TABLE . ' - WHERE imageset_id = ' . $style_id; - $result = $db->sql_query($sql); - $style_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$style_row) - { - trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action)); - } - - $name = $style_row['imageset_name']; - unset($style_row['imageset_name']); - - if ($update) - { - $images = (isset($_POST['src'])) ? request_var('src', array('' => '')) : array(); - $image_width = (isset($_POST['width'])) ? array_map('intval', $_POST['width']) : array(); - $image_height = (isset($_POST['height'])) ? array_map('intval', $_POST['height']) : array(); - - $img_array = array(); - - foreach ($images as $image_name => $value) - { - if (!empty($value)) - { - $width = ($image_width[$image_name] == 0) ? '' : $image_width[$image_name]; - $img_array[$image_name] = $value . '*' . $image_height[$image_name] . '*' . $width; - } - else - { - $img_array[$image_name] = ''; - } - } - - $sql = 'UPDATE ' . STYLES_IMAGE_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $img_array) . " - WHERE imageset_id = $style_id"; - $db->sql_query($sql); - - $cache->destroy('sql', STYLES_IMAGE_TABLE); - - add_log('admin', 'LOG_IMAGESET_EDIT', $name); - trigger_error($user->lang['EDITED_IMAGESET'] . adm_back_link($this->u_action)); - } + global $db, $user, $phpbb_root_path, $cache, $template; $this->page_title = 'EDIT_IMAGESET'; + $update = (isset($_POST['update'])) ? true : false; + $imgname = (!empty($_POST['imgname'])) ? htmlspecialchars($_POST['imgname']) : ''; + $imgpath = (isset($_POST['imgpath'])) ? htmlspecialchars($_POST['imgpath']) : ''; + $imgsize = (!empty($_POST['imgsize'])) ? true : false; + $imgwidth = (isset($_POST['imgwidth'])) ? intval($_POST['imgwidth']) : ''; - foreach ($style_row as $key => $value) + if ($style_id) { - $width = $height = $imgsrc = ''; - if (!empty($value)) + $sql_select = ($imgname) ? ", $imgname" : ''; + $sql = "SELECT imageset_path, imageset_name, imageset_copyright$sql_select + FROM " . STYLES_IMAGE_TABLE . " + WHERE imageset_id = $style_id"; + $result = $db->sql_query($sql); + + if (!extract($db->sql_fetchrow($result))) { - $values = explode('*', $value); - $imgsrc = $values[0]; - $height = (!empty($values[1])) ? $values[1] : ''; - $width = (!empty($values[2])) ? $values[2] : ''; + trigger_error($user->lang['NO_IMAGESET']); + } + $db->sql_freeresult($result); + + // Check to see whether the selected image exists in the table + $valid_name = ($update) ? false : true; + $imglist = array( + 'logos' => array( + 'site_logo', + ), + 'buttons' => array( + 'btn_post', 'btn_reply', 'btn_locked', 'btn_quote', 'btn_edit', 'btn_delete', 'btn_report', 'btn_post_pm', 'btn_reply_pm', 'btn_profile', 'btn_pm', 'btn_ip', 'btn_search', 'btn_email', 'btn_www', 'btn_icq', 'btn_aim', 'btn_yim', 'btn_msnm', 'btn_jabber', 'btn_online', 'btn_offline', + ), + 'icons' => array( + 'icon_unapproved', 'icon_reported', 'icon_attach', 'icon_post', 'icon_post_new', 'icon_post_latest', 'icon_post_newest',), + 'forums' => array( + 'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',), + 'folders' => array( + 'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted',), + 'polls' => array( + 'poll_left', 'poll_center', 'poll_right',), + ); + foreach ($imglist as $category => $img_ary) + { + if (in_array($imgname, $img_ary)) + { + $valid_name = true; + break; + } } - $template->assign_block_vars('element', array( - 'NAME' => $key, - 'SRC' => $imgsrc, - 'HEIGHT' => $height, - 'WIDTH' => $width, - 'IMG_SRC' => $phpbb_root_path . 'styles/' . $user->theme['imageset_path'] . '/imageset/' . str_replace('{LANG}', $user->img_lang, $imgsrc) - ) - ); + if ($update && $imgpath) + { + if ($valid_name) + { + // If imgwidth and imgheight are non-zero grab the actual size + // from the image itself ... we ignore width settings for the poll center + // image + $imgwidth = $imgheight = ''; + if ($imgsize) + { + list($imgwidth, $imgheight) = getimagesize("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath"); + $imgheight = '*' . $imgheight; + $imgwidth = ($imgname != 'poll_center') ? '*' . $imgwidth : ''; + } + + $imgpath = preg_replace('/^([^\/]+\/)/', '{LANG}/', $imgpath) . $imgheight . $imgwidth; + + $sql = 'UPDATE ' . STYLES_IMAGE_TABLE . " + SET $imgname = '$imgpath' + WHERE imageset_id = $style_id"; + $db->sql_query($sql); + + $cache->destroy('sql', STYLES_IMAGE_TABLE); + + add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name); + + $template->assign_var('SUCCESS', true); + $$imgname = $imgpath; + } + } } + // Generate list of image options + $img_options = ''; + foreach ($imglist as $category => $img_ary) + { + $template->assign_block_vars('category', array( + 'NAME' => $user->lang['IMG_CAT_' . strtoupper($category)] + )); + foreach ($img_ary as $img) + { + $template->assign_block_vars('category.images', array( + 'SELECTED' => ($img == $imgname), + 'VALUE' => $img, + 'TEXT' => (($category == 'custom') ? $img : $user->lang['IMG_' . strtoupper($img)]) + )); + } + } + + // TODO + // Check whether localised buttons exist in admins language first + // Clean up this code + $imglang = ''; + $imagesetlist = array('nolang' => array(), 'lang' => array()); + $dp = opendir("{$phpbb_root_path}styles/$imageset_path/imageset"); + while ($file = readdir($dp)) + { + if (!is_file($file) && !is_link($file) && $file{0} != '.' && strtoupper($file) != 'CVS' && !sizeof($imagesetlist['lang'])) + { + $dp2 = opendir("{$phpbb_root_path}styles/$imageset_path/imageset/$file"); + while ($file2 = readdir($dp2)) + { + $imglang = $file; + if (preg_match('#\.(?:gif|jpg|png)$#', $file2)) + { + $imagesetlist['lang'][] = "$file/$file2"; + } + } + closedir($dp2); + } + else if (preg_match('#\.(?:gif|jpg|png)$#', $file)) + { + $imagesetlist['nolang'][] = $file; + } + } + closedir($dp); + + $imagesetlist_options = ''; + foreach ($imagesetlist as $type => $img_ary) + { + $template->assign_block_vars('imagesetlist', array( + 'TYPE' => ($type == 'lang') + )); + foreach ($img_ary as $img) + { + $imgtext = preg_replace('/^([^\/]+\/)/', '', $img); + $selected = (!empty($imgname) && strpos($$imgname, $imgtext) !== false); + if ($selected) + { + $template->assign_var('IMAGE_SELECT', true); + } + $template->assign_block_vars('imagesetlist.images', array( + 'SELECTED' => $selected, + 'TEXT' => $imgtext, + 'VALUE' => htmlspecialchars($img) + )); + } + } + + $imgsize_bool = (!empty($imgname) && ($imgsize || preg_match('#\*\d+#', $$imgname))) ? true : false; $template->assign_vars(array( 'S_EDIT_IMAGESET' => true, 'L_TITLE' => $user->lang[$this->page_title], 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - - 'U_ACTION' => $this->u_action . "&action=edit&id=$style_id", - 'U_BACK' => $this->u_action, - 'NAME' => $name, - ) - ); + 'IMAGE_OPTIONS' => $img_options, + 'IMAGELIST_OPTIONS' => $imagesetlist_options, + 'IMAGE_SIZE' => $imgsize_bool, + 'IMAGE_REQUEST' => (!empty($imgname)) ? '../styles/' . $imageset_path . '/imageset/' . str_replace('{LANG}', $imglang, current(explode('*', $$imgname))) : '', + 'U_ACTION' => $this->u_action . "&action=edit&id=$style_id", + 'U_BACK' => $this->u_action, + 'NAME' => $imageset_name, + 'ERROR' => !$valid_name + )); } /** diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ea3cafda79..a5c96f5031 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2051,7 +2051,9 @@ function page_header($page_title = '') 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&id=" . $user->theme['style_id'], 'T_STYLESHEET_NAME' => $user->theme['theme_name'], - 'T_THEME_DATA' => (!$user->theme['theme_storedb']) ? '' : $user->theme['theme_data']) + 'T_THEME_DATA' => (!$user->theme['theme_storedb']) ? '' : $user->theme['theme_data'], + + 'SITE_LOGO_IMG' => $user->img('site_logo')) ); if ($config['send_encoding']) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 99d0a851dc..0a6dddfe8b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -334,7 +334,7 @@ INSERT INTO phpbb_styles (style_id, style_name, style_copyright, template_id, th # MSSQL IDENTITY phpbb_styles_imageset ON # # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', ''); +INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', 'sitelogo.gif*94*170', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', ''); # MSSQL IDENTITY phpbb_styles_imageset OFF # diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index cffb03bdab..8841083d37 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -63,7 +63,7 @@ $lang = array_merge($lang, array( 'DETAILS' => 'Details', 'EDIT_IMAGESET' => 'Edit imageset', - 'EDIT_IMAGESET_EXPLAIN' => 'Here you can modify the images stored in the currently selected imageset.', + 'EDIT_IMAGESET_EXPLAIN' => 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.', 'IMAGE_CONFIGURATION' => 'Image configuration', 'IMAGE_WIDTH' => 'Image width', 'IMAGE_HEIGHT' => 'Image height', @@ -85,6 +85,7 @@ $lang = array_merge($lang, array( 'IMAGESET_ADDED' => 'New imageset added on filesystem', 'IMAGESET_ADDED_DB' => 'New imageset added to database', + 'IMAGESET_UPDATED' => 'Imageset updated successfully', 'IMAGESET_DELETED' => 'Imageset deleted successfully', 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem', 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated', @@ -118,6 +119,7 @@ $lang = array_merge($lang, array( 'EDITED_IMAGESET' => 'Edited imageset', 'NO_IMAGESET' => 'Cannot find imageset on filesystem', + 'NO_IMAGE' => 'No Image', 'NO_STYLE' => 'Cannot find style on filesystem', 'NO_TEMPLATE' => 'Cannot find template on filesystem', 'NO_THEME' => 'Cannot find theme on filesystem', @@ -216,6 +218,94 @@ $lang = array_merge($lang, array( 'UNINSTALLED_TEMPLATE' => 'Uninstalled templates', 'UNINSTALLED_THEME' => 'Uninstalled themes', + // Imageset data + 'SELECTED_IMAGESET' => 'Selected imageset', + 'SELECT_IMAGE' => 'Select image', + 'IMAGE' => 'Image', + 'CURRENT_IMAGE' => 'Current Image', + 'SELECTED_IMAGE' => 'Selected Image', + 'DIMENSIONS' => 'Include dimensions', + 'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.', + 'IMAGE_PARAMETER' => 'Parameter', + 'IMAGE_VALUE' => 'Value', + 'LOCALISED_IMAGES' => 'Localised', + 'GLOBAL_IMAGES' => 'Global', + 'IMG_CAT_LOGOS' => 'Logos', + 'IMG_SITE_LOGO' => 'Main Logo', + 'IMG_CAT_BUTTONS' => 'Localised buttons', + 'IMG_BTN_POST' => 'New topic', + 'IMG_BTN_REPLY' => 'Reply topic', + 'IMG_BTN_LOCKED' => 'Topic locked', + 'IMG_BTN_POST_PM' => 'New message', + 'IMG_BTN_REPLY_PM' => 'Reply message', + 'IMG_BTN_DELETE' => 'Delete post', + 'IMG_BTN_QUOTE' => 'Quote post', + 'IMG_BTN_PROFILE' => 'Show profile', + 'IMG_BTN_EMAIL' => 'Send email', + 'IMG_BTN_SEARCH' => 'Search posts', + 'IMG_BTN_WWW' => 'Website', + 'IMG_BTN_IP' => 'Show IP', + 'IMG_BTN_EDIT' => 'Edit post', + 'IMG_BTN_AIM' => 'AIM', + 'IMG_BTN_ICQ' => 'ICQ', + 'IMG_BTN_JABBER' => 'Jabber', + 'IMG_BTN_YIM' => 'YIM', + 'IMG_BTN_MSNM' => 'MSNM', + 'IMG_BTN_ONLINE' => 'User online', + 'IMG_BTN_OFFLINE' => 'User offline', + 'IMG_BTN_REPORT' => 'Report post', + 'IMG_BTN_PM' => 'Send message', + 'IMG_BTN_FRIEND' => 'Add as friend', + 'IMG_BTN_FOE' => 'Add as foe', + 'IMG_CAT_ICONS' => 'General icons', + 'IMG_ICON_UNAPPROVED' => 'Post unapproved', + 'IMG_ICON_REPORTED' => 'Post reported', + 'IMG_ICON_ATTACH' => 'Attachment', + 'IMG_ICON_POST' => 'Minipost', + 'IMG_ICON_POST_NEW' => 'New minipost', + 'IMG_ICON_POST_LATEST' => 'Last post', + 'IMG_ICON_POST_NEWEST' => 'Newest post', + 'IMG_CAT_FORUMS' => 'Forum icons', + 'IMG_FORUM' => 'Forum', + 'IMG_FORUM_NEW' => 'Forum new posts', + 'IMG_FORUM_LOCKED' => 'Forum locked', + 'IMG_FORUM_LINK' => 'Forum link', + 'IMG_SUB_FORUM' => 'Subforum', + 'IMG_SUB_FORUM_NEW' => 'Subforum new posts', + 'IMG_CAT_FOLDERS' => 'Topic icons', + 'IMG_FOLDER' => 'Topic', + 'IMG_FOLDER_NEW' => 'Topic new posts', + 'IMG_FOLDER_LOCKED' => 'Topic locked', + 'IMG_FOLDER_POSTED' => 'Topic posted to', + 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new', + 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new', + 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to', + 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new', + 'IMG_FOLDER_HOT' => 'Topic hot', + 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts', + 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to', + 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new', + 'IMG_FOLDER_STICKY' => 'Sticky topic', + 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to', + 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts', + 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new', + 'IMG_FOLDER_ANNOUNCE' => 'Announcement', + 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts', + 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to', + 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new', + 'IMG_FOLDER_GLOBAL' => 'Global', + 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts', + 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to', + 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new', + 'IMG_CAT_POLLS' => 'Polling images', + 'IMG_POLL_LEFT' => 'Poll left end', + 'IMG_POLL_RIGHT' => 'Poll right end', + 'IMG_POLL_CENTER' => 'Poll centre', + 'IMG_CAT_KARMA' => 'Karma images', + 'IMG_KARMA_LEFT' => 'Karma left end', + 'IMG_KARMA_CENTER' => 'Karma centre', + 'IMG_KARMA_RIGHT' => 'Karma right end', + 'IMG_CAT_CUSTOM' => 'Custom images', )); ?> \ No newline at end of file diff --git a/phpBB/styles/subSilver/imageset/imageset.cfg b/phpBB/styles/subSilver/imageset/imageset.cfg index d8b7acc531..2269a31ed3 100644 --- a/phpBB/styles/subSilver/imageset/imageset.cfg +++ b/phpBB/styles/subSilver/imageset/imageset.cfg @@ -22,7 +22,7 @@ copyright = version = 2.1.1 # Images -img_site_logo = +img_site_logo = sitelogo.gif*94*170 img_btn_post = {LANG}/btn_post.gif*27*97 img_btn_post_pm = {LANG}/btn_post_pm.gif*27*97 img_btn_reply = {LANG}/btn_reply.gif*27*97 diff --git a/phpBB/styles/subSilver/theme/images/sitelogo.gif b/phpBB/styles/subSilver/imageset/sitelogo.gif similarity index 100% rename from phpBB/styles/subSilver/theme/images/sitelogo.gif rename to phpBB/styles/subSilver/imageset/sitelogo.gif diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index ea37b539c3..2ec91adb85 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -68,7 +68,7 @@ function jumpto()
- +
{SITE_LOGO_IMG}

{SITENAME}

{SITE_DESCRIPTION}