makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Bug #9791

Browse source 
- Replaced .blue class with the .sep class to keep things consistent


git-svn-id: file:///svn/phpbb/trunk@7329 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Vic D'Elfant 2007-04-12 12:54:57 +00:00
parent 07a5ab8713
commit f0868d37df
13 changed files with 3544 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_attachments.php
View file

@ -775,11 +775,11 @@ class acp_attachments
{ {
$cat_right = max($cat_right, $row['right_id']); $cat_right = max($cat_right, $row['right_id']);
$holding .= '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="blue"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>'; $holding .= '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
} }
else else
{ {
$s_forum_id_options .= $holding . '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="blue"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>'; $s_forum_id_options .= $holding . '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
$holding = ''; $holding = '';
} }
} }

2
phpBB/includes/acp/acp_permissions.php
View file

@ -826,7 +826,7 @@ class acp_permissions
$l_ug_list = ''; $l_ug_list = '';
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$l_ug_list .= (($l_ug_list != '') ? ', ' : '') . ((isset($row['group_type']) && $row['group_type'] == GROUP_SPECIAL) ? '<span class="blue">' . $user->lang['G_' . $row['name']] . '</span>' : $row['name']); $l_ug_list .= (($l_ug_list != '') ? ', ' : '') . ((isset($row['group_type']) && $row['group_type'] == GROUP_SPECIAL) ? '<span class="sep">' . $user->lang['G_' . $row['name']] . '</span>' : $row['name']);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

2
phpBB/includes/ucp/ucp_pm.php
View file

@ -340,7 +340,7 @@ class ucp_pm
$s_folder_options = $s_to_folder_options = ''; $s_folder_options = $s_to_folder_options = '';
foreach ($folder as $f_id => $folder_ary) foreach ($folder as $f_id => $folder_ary)
{ {
$option = '<option' . ((!in_array($f_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX))) ? ' class="blue"' : '') . ' value="' . $f_id . '"' . (($f_id == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>'; $option = '<option' . ((!in_array($f_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX))) ? ' class="sep"' : '') . ' value="' . $f_id . '"' . (($f_id == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>';
$s_to_folder_options .= ($f_id != PRIVMSGS_OUTBOX && $f_id != PRIVMSGS_SENTBOX) ? $option : ''; $s_to_folder_options .= ($f_id != PRIVMSGS_OUTBOX && $f_id != PRIVMSGS_SENTBOX) ? $option : '';
$s_folder_options .= $option; $s_folder_options .= $option;

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -82,7 +82,7 @@ function compose_pm($id, $mode, $action)
$group_options = ''; $group_options = '';
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; $group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }

33
phpBB/includes/ucp/ucp_pm_options.php
View file

@ -623,7 +623,7 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
*/ */
function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions) function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
{ {
global $db, $template, $auth; global $db, $template, $auth, $user;
$template->assign_vars(array( $template->assign_vars(array(
'S_COND_DEFINED' => true, 'S_COND_DEFINED' => true,
@ -706,11 +706,28 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
$rule_group_id = request_var('rule_group_id', 0); $rule_group_id = request_var('rule_group_id', 0);
$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true)); $rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
$sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; $sql = 'SELECT g.group_id, g.group_name, g.group_type
$sql = 'SELECT group_id, group_name, group_type FROM ' . GROUPS_TABLE . ' g ';
FROM ' . GROUPS_TABLE . "
WHERE group_type $sql_and if (!$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
ORDER BY group_type DESC, group_name"; {
$sql .= 'LEFT JOIN ' . USER_GROUP_TABLE . ' ug
ON (
g.group_id = ug.group_id
AND ug.user_id = ' . $user->data['user_id'] . '
AND ug.user_pending = 0
)
WHERE (ug.user_id = ' . $user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ')
AND';
}
else
{
$sql .= 'WHERE';
}
$sql .= " NOT (g.group_name IN ('GUESTS', 'BOTS') AND g.group_type = " . GROUP_SPECIAL . ')
ORDER BY g.group_type DESC, g.group_name ASC';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$s_group_options = ''; $s_group_options = '';
@ -721,8 +738,10 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
$rule_string = (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']); $rule_string = (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']);
} }
$s_class = ($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '';
$s_selected = ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : ''; $s_selected = ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : '';
$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_class . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

2
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -72,7 +72,7 @@ function view_folder($id, $mode, $folder_id, $folder)
continue; continue;
} }
$s_folder_move_options .= '<option' . (($f_id != PRIVMSGS_INBOX) ? ' class="blue"' : '') . ' value="' . $f_id . '">'; $s_folder_move_options .= '<option' . (($f_id != PRIVMSGS_INBOX) ? ' class="sep"' : '') . ' value="' . $f_id . '">';
$s_folder_move_options .= sprintf($user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']); $s_folder_move_options .= sprintf($user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']);
$s_folder_move_options .= (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>'; $s_folder_move_options .= (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>';
} }

4
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
View file

@ -83,7 +83,7 @@ hr.sep {
<td width="10%" nowrap="nowrap">{L_TO}:</td> <td width="10%" nowrap="nowrap">{L_TO}:</td>
<td> <td>
<!-- BEGIN to_recipient --> <!-- BEGIN to_recipient -->
<!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp; <!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp;
<!-- END to_recipient --> <!-- END to_recipient -->
</td> </td>
</tr> </tr>
@ -94,7 +94,7 @@ hr.sep {
<td width="10%" nowrap="nowrap">{L_BCC}:</td> <td width="10%" nowrap="nowrap">{L_BCC}:</td>
<td> <td>
<!-- BEGIN bcc_recipient --> <!-- BEGIN bcc_recipient -->
<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp; <!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
<!-- END bcc_recipient --> <!-- END bcc_recipient -->
</td> </td>
</tr> </tr>

4
phpBB/styles/prosilver/theme/colours.css
View file

@ -158,6 +158,10 @@ dl.details dd {
color: #536482; color: #536482;
} }
.sep {
color: #1198D9;
}
/* Pagination /* Pagination
---------------------------------------- */ ---------------------------------------- */

3507
phpBB/styles/prosilver/theme/stylesheet.css
View file

File diff suppressed because it is too large Load diff

4
phpBB/styles/subsilver2/template/posting_body.html
View file

@ -148,7 +148,7 @@
{S_HIDDEN_ADDRESS_FIELD} {S_HIDDEN_ADDRESS_FIELD}
<!-- BEGIN to_recipient --> <!-- BEGIN to_recipient -->
<span style="display: block; float: {S_CONTENT_FLOW_BEGIN};" class="nowrap genmed"><strong> <span style="display: block; float: {S_CONTENT_FLOW_BEGIN};" class="nowrap genmed"><strong>
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><span class="blue">{to_recipient.NAME}</span></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF --> <!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><span class="sep">{to_recipient.NAME}</span></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF -->
</span> </span>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<span class="genmed">{L_NO_TO_RECIPIENT}</span> <span class="genmed">{L_NO_TO_RECIPIENT}</span>
@ -161,7 +161,7 @@
<td class="row2"> <td class="row2">
<!-- BEGIN bcc_recipient --> <!-- BEGIN bcc_recipient -->
<span class="genmed nowrap"><strong> <span class="genmed nowrap"><strong>
<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><span class="blue">{bcc_recipient.NAME}</span></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF --> <!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><span class="sep">{bcc_recipient.NAME}</span></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --></strong>&nbsp;<!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF -->
</span> </span>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<span class="genmed">{L_NO_BCC_RECIPIENT}</span> <span class="genmed">{L_NO_BCC_RECIPIENT}</span>

4
phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
View file

@ -27,7 +27,7 @@
<td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}:</b></td> <td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}:</b></td>
<td class="gen"> <td class="gen">
<!-- BEGIN to_recipient --> <!-- BEGIN to_recipient -->
<!-- IF to_recipient.IS_GROUP --><span class="blue"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF --> <!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
<!-- END to_recipient --> <!-- END to_recipient -->
</td> </td>
</tr> </tr>
@ -38,7 +38,7 @@
<td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}:</b></td> <td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}:</b></td>
<td class="gen"> <td class="gen">
<!-- BEGIN bcc_recipient --> <!-- BEGIN bcc_recipient -->
<!-- IF bcc_recipient.IS_GROUP --><span class="blue"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF --> <!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
<!-- END bcc_recipient --> <!-- END bcc_recipient -->
</td> </td>
</tr> </tr>

4
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
View file

@ -85,7 +85,7 @@ hr.sep {
<td width="10%" nowrap="nowrap">{L_TO}:</td> <td width="10%" nowrap="nowrap">{L_TO}:</td>
<td> <td>
<!-- BEGIN to_recipient --> <!-- BEGIN to_recipient -->
<!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp; <!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp;
<!-- END to_recipient --> <!-- END to_recipient -->
</td> </td>
</tr> </tr>
@ -96,7 +96,7 @@ hr.sep {
<td width="10%" nowrap="nowrap">{L_BCC}:</td> <td width="10%" nowrap="nowrap">{L_BCC}:</td>
<td> <td>
<!-- BEGIN bcc_recipient --> <!-- BEGIN bcc_recipient -->
<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp; <!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
<!-- END bcc_recipient --> <!-- END bcc_recipient -->
</td> </td>
</tr> </tr>

4
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -646,10 +646,6 @@ img {
border: none; border: none;
} }
.blue {
color: #006699;
}
.sep { .sep {
color: black; color: black;
background-color: #FFA34F; background-color: #FFA34F;