From 0d7b31e884068fc6fb84b2fbb09083cb1985cea6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 15 May 2007 10:55:17 +0000 Subject: [PATCH] added subforum read/unread icons (thanks to thatbitextra for providing them). fixed issue with forum passwords only alloweing ASCII in administration while allowing non-ASCII on user-entered passwords git-svn-id: file:///svn/phpbb/trunk@7581 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/INSTALL.html | 2 +- phpBB/includes/acp/acp_forums.php | 4 ++-- phpBB/install/database_update.php | 3 +++ phpBB/install/schemas/schema_data.sql | 2 ++ phpBB/styles/prosilver/imageset/imageset.cfg | 3 +++ phpBB/styles/prosilver/imageset/subforum_read.gif | Bin 0 -> 124 bytes .../styles/prosilver/imageset/subforum_unread.gif | Bin 0 -> 124 bytes phpBB/styles/prosilver/theme/colours.css | 8 ++++++++ phpBB/styles/prosilver/theme/content.css | 9 ++++++++- phpBB/styles/subsilver2/imageset/imageset.cfg | 3 +++ 10 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 phpBB/styles/prosilver/imageset/subforum_read.gif create mode 100644 phpBB/styles/prosilver/imageset/subforum_unread.gif diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 7dbea1fb7a..e67e9b2a10 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -311,7 +311,7 @@ p a {

Administrator details

-

Now you have to create your administration user. This user will have full administration access and he will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English. You can download further languages from www.phpbb.com, and add them before installing or later.

+

Now you have to create your administration user. This user will have full administration access and he/she will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English. You can download further languages from www.phpbb.com, and add them before installing or later.

Configuration file

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 1fc64acdbc..cf25945df7 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -129,8 +129,8 @@ class acp_forums 'prune_old_polls' => request_var('prune_old_polls', false), 'prune_announce' => request_var('prune_announce', false), 'prune_sticky' => request_var('prune_sticky', false), - 'forum_password' => request_var('forum_password', ''), - 'forum_password_confirm'=> request_var('forum_password_confirm', ''), + 'forum_password' => request_var('forum_password', '', true), + 'forum_password_confirm'=> request_var('forum_password_confirm', '', true), ); // Use link_display_on_index setting if forum type is link diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 79c7145797..ec90b4e205 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1052,6 +1052,8 @@ if (version_compare($current_version, '3.0.b5', '<=')) INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', '', 11, 11, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', '', 20, 20, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_read', 'subforum_read.gif', '', 9, 11, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'en', 20, 28, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'en', 20, 42, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'en', 20, 54, 1); @@ -1064,6 +1066,7 @@ if (version_compare($current_version, '3.0.b5', '<=')) INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'en', 25, 88, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'en', 25, 96, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'en', 25, 96, 1);"; + $data = str_replace('phpbb_', $table_prefix, $data); $sql_ary = explode("\n", $data); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c342206f66..6d3047fb3c 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -453,6 +453,8 @@ INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', '', 11, 11, 1); INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', '', 20, 20, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_read', 'subforum_read.gif', '', 9, 11, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1); # -- phpbb_styles_template INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=', 0); diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg index 21dc56e00b..87c6fc3c93 100644 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ b/phpBB/styles/prosilver/imageset/imageset.cfg @@ -80,6 +80,9 @@ img_global_unread_mine = announce_unread_mine.gif*27*27 img_global_unread_locked = announce_unread_locked.gif*27*27 img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27 +img_subforum_read = subforum_read.gif*9*11 +img_subforum_unread = subforum_unread.gif*9*11 + img_pm_read = topic_read.gif*27*27 img_pm_unread = topic_unread.gif*27*27 diff --git a/phpBB/styles/prosilver/imageset/subforum_read.gif b/phpBB/styles/prosilver/imageset/subforum_read.gif new file mode 100644 index 0000000000000000000000000000000000000000..595595c296b9f5ee56bef5cfcbca9a8d6f50d614 GIT binary patch literal 124 zcmZ?wbhEHb|NsB~{rmg(@6Vq&HJ;oW`jcTFl9ETMcWETo?RWY^} Y%5-WovMn&HJ;oW`jcTFl9ETMcWETo?RWY^} Y%5-WovMn<{9 literal 0 HcmV?d00001 diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index c10300405e..70d89e7370 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -372,6 +372,14 @@ ul.topiclist dd { border-left-color: #FFFFFF; } +ul.topiclist li.row dt a.subforum.read { + background-image: url("{IMG_SUBFORUM_READ_SRC}"); +} + +ul.topiclist li.row dt a.subforum.unread { + background-image: url("{IMG_SUBFORUM_UNREAD_SRC}"); +} + li.row { border-top-color: #FFFFFF; border-bottom-color: #00608F; diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 102391807d..676211b72d 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -47,6 +47,13 @@ ul.topiclist dfn { display: none; } +ul.topiclist li.row dt a.subforum { + background-image: none; + background-position: 0pt 50%; + background-repeat: no-repeat; + padding: 0 0 0 12px; +} + li.row { border-top: 1px solid #FFFFFF; border-bottom: 1px solid #8f8f8f; @@ -105,7 +112,7 @@ dl.icon { dl.icon dt { padding-left: 45px; /* Space for folder icon */ background-repeat: no-repeat; - background-position: 27px 70%; /* Position of topic icon */ + background-position: 5px 95%; /* Position of topic icon */ } dd.posts, dd.topics, dd.views { diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg index a6713ce1ae..44f44007d7 100644 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ b/phpBB/styles/subsilver2/imageset/imageset.cfg @@ -81,6 +81,9 @@ img_global_unread_mine = announce_unread_mine.gif*18*19 img_global_unread_locked = announce_unread_locked.gif*18*19 img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19 +img_subforum_read = +img_subforum_unread = + img_pm_read = topic_read.gif*18*19 img_pm_unread = topic_unread.gif*18*19