aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-11-26 14:41:59 +0000
committerNils Adermann <naderman@naderman.de>2006-11-26 14:41:59 +0000
commit5c5330c29d3e19eab804d9dbfd0261e6459e00b8 (patch)
tree186d83619f9fdb0850110efe786c8bf753cc87a0 /phpBB
parente3889a72e802c4dfea6812f9ff29f5acdd302a76 (diff)
downloadforums-5c5330c29d3e19eab804d9dbfd0261e6459e00b8.tar
forums-5c5330c29d3e19eab804d9dbfd0261e6459e00b8.tar.gz
forums-5c5330c29d3e19eab804d9dbfd0261e6459e00b8.tar.bz2
forums-5c5330c29d3e19eab804d9dbfd0261e6459e00b8.tar.xz
forums-5c5330c29d3e19eab804d9dbfd0261e6459e00b8.zip
Message for my last commit (no I didn't intent it to be "message"):
- include forums without search indexing in author searches and egosearch [Bug #5530, #4782] - allow changing search options when there are no results if a pre-defined search is used - added user_pass_convert flag for unconverted phpBB2 passwords and password conversion on first login and for this commit: - truncating dropdown in acp_styles and showing tooltip with complete string [Bug #5258] - UTF-8 compatible font for OS X users in ACP - destroy search cache on changing a post author [Bug #5538] git-svn-id: file:///svn/phpbb/trunk@6659 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/acp_styles.html7
-rw-r--r--phpBB/adm/style/admin.css28
-rw-r--r--phpBB/includes/acp/acp_styles.php2
-rw-r--r--phpBB/includes/mcp/mcp_post.php17
4 files changed, 39 insertions, 15 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index d592dbaa25..3207c14d05 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -254,6 +254,13 @@
<h3>{L_SHOW_CSS_NOTE}</h3>
<p>{L_SHOW_CSS_EXPLAIN}</p>
<!-- ENDIF -->
+ <!-- include tooltip file -->
+ <script type="text/javascript" src="style/tooltip.js"></script>
+ <script type="text/javascript">
+ <!--
+ window.onload = function(){enable_tooltips_select('acp_styles', '', 'css_class')};
+ //-->
+ </script>
<form id="acp_styles" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 16901cd500..bedb045397 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -23,7 +23,7 @@ html {
body {
/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
color: #536482;
background: #E4EDF0 url("../images/bg_header.gif") 0 0 repeat-x;
font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */
@@ -35,13 +35,13 @@ img {
}
h1 {
- font: bold 1.8em 'Trebuchet MS', Verdana, sans-serif;
+ font: bold 1.8em "Lucida Grande", 'Trebuchet MS', Verdana, sans-serif;
text-decoration: none;
color: #333333;
}
h2, caption {
- font: bold 1.2em Arial, Helvetica, sans-serif;
+ font: bold 1.2em "Lucida Grande", Arial, Helvetica, sans-serif;
text-decoration: none;
line-height: 120%;
text-align: left;
@@ -99,7 +99,7 @@ a:hover {
}
#page-header h1 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 1.5em;
font-weight: normal;
padding-top: 15px;
@@ -281,7 +281,7 @@ span.corners-top span, span.corners-bottom span {
display: block;
padding: 5px;
font-size: 0.9em;
- font-family: Verdana;
+ font-family: "Lucida Grande", Verdana;
color: #FFA34F;
font-weight: bold;
background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x;
@@ -311,7 +311,7 @@ table {
}
th, td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 1.1em;
text-align: left;
}
@@ -384,7 +384,7 @@ fieldset p {
legend {
padding: 1px 0;
- font-family: arial,Verdana,Sans-serif;
+ font-family: "Lucida Grande", Arial, Verdana,Sans-serif;
font-size: 1.1em;
font-weight: bold;
color: #006699;
@@ -402,7 +402,7 @@ legend {
}
input {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
font-weight: normal;
background-color: #FAFAFA;
@@ -417,7 +417,7 @@ input {
}
select {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
font-weight: normal;
font-style: normal;
@@ -443,7 +443,7 @@ option {
}
textarea {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
width: 60%;
padding: 2px;
@@ -525,7 +525,7 @@ select#full_folder_action {
Other general def. list properties defined in prosilver_main.css
---------------------------------------- */
dl {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
}
dt {
@@ -738,7 +738,7 @@ a.button1, input.button1, input.button3,
a.button2, input.button2 {
width: auto !important;
padding: 1px 3px 0 3px;
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
color: #000;
background-color: #EFEFEF;
cursor: pointer;
@@ -1038,7 +1038,7 @@ table.pmask td.name {
---------------------------------------- */
.sourcenum {
color: gray;
- font-family: 'Courier New', monospace;
+ font-family: Monaco, 'Courier New', monospace;
font-size: 125%;
font-weight: bold;
line-height: 120%;
@@ -1047,7 +1047,7 @@ table.pmask td.name {
}
.source {
- font-family: 'Courier New', monospace;
+ font-family: Monaco, 'Courier New', monospace;
font-size: 125%;
line-height: 120%;
padding: 0px;
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 4377dd7e20..e5e5f1a2b8 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -978,7 +978,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
foreach ($classes as $class)
{
$selected = ($class == $edit_class) ? ' selected="selected"' : '';
- $s_classes .= '<option value="' . $class . '"' . $selected . '>' . $class . '</option>';
+ $s_classes .= '<option value="' . $class . '" title="' . $class . '"' . $selected . '>' . substr($class, 0, 40) . '</option>';
}
$template->assign_vars(array(
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index b2b0ceb419..a1cc7f4331 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -385,6 +385,23 @@ function change_poster(&$post_info, $userdata)
$db->sql_query($sql);
}
+ // refresh search cache of this post
+ $search_type = basename($config['search_type']);
+
+ if (file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+ {
+ require("{$phpbb_root_path}includes/search/$search_type.$phpEx");
+
+ // We do some additional checks in the module to ensure it can actually be utilised
+ $error = false;
+ $search = new $search_type($error);
+
+ if (!$error && method_exists($search, 'destroy_cache'))
+ {
+ $search->destroy_cache(array(), array($post_info['user_id'], $userdata['user_id']));
+ }
+ }
+
$from_username = $post_info['username'];
$to_username = $userdata['username'];
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-23 08:50:05 +0000