Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some theme fixes #1437

Merged
merged 4 commits into from Mar 1, 2014
Merged

some theme fixes #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1a33e0
* the post approval warning box had the wrong width and was part of t…
eurich Feb 28, 2014
c26f7c6
* post approval background was missing in "Be Social!"
eurich Feb 28, 2014
518e93a
* approval indication was looking horrible. replaced it with a more c…
eurich Feb 28, 2014
d2054df
* the max width of an inner element was in some cases larger than the…
eurich Feb 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions themes/default/MessageIndex.template.php
View file
Open in desktop
Expand Up @@ -144,6 +144,11 @@ function template_topic_listing()
echo '
<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="UTF-8" class="clear" name="quickModForm" id="quickModForm">';

// If this person can approve items and we have some awaiting approval tell them.
if (!empty($context['unapproved_posts_message']))
echo '
<div class="warningbox">! ', $context['unapproved_posts_message'], '</div>';

echo '
<ul class="topic_listing" id="messageindex">
<li class="topic_sorting_row">';
Expand All @@ -156,15 +161,6 @@ function template_topic_listing()
echo '
</li>';

// If this person can approve items and we have some awaiting approval tell them.
if (!empty($context['unapproved_posts_message']))
{
echo '
<li class="basic_row">
<div class="warningbox">! ', $context['unapproved_posts_message'], '</div>
</li>';
}

foreach ($context['topics'] as $topic)
{
// Is this topic pending approval, or does it have any posts pending approval?
Expand Down Expand Up @@ -198,8 +194,12 @@ function template_topic_listing()
echo '
<a class="new_posts" href="', $topic['new_href'], '" id="newicon' . $topic['first_post']['id'] . '">' . $txt['new'] . '</a>';

// Is this an unapproved topic and they can approve it?
if ($context['can_approve_posts'] && !$topic['approved'])
echo '<span class="require_approval">' . $txt['awaiting_approval'] . '</span>';

echo '
', $topic['is_sticky'] ? '<strong>' : '', '<span class="preview" title="', $topic['default_preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '&nbsp;&nbsp;<em><img src="' . $settings['images_url'] . '/admin/post_moderation_moderate.png" style="width:16px" alt="' . $txt['awaiting_approval'] . '" title="' . $txt['awaiting_approval'] . '" />(' . $txt['awaiting_approval'] . ')</em>' : ''), '</span></span>', $topic['is_sticky'] ? '</strong>' : '', '
', $topic['is_sticky'] ? '<strong>' : '', '<span class="preview" title="', $topic['default_preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span></span>', $topic['is_sticky'] ? '</strong>' : '', '
</h4>
</div>
<div class="topic_starter">
Expand Down
13 changes: 10 additions & 3 deletions themes/default/css/_besocial/index_besocial.css
View file
Open in desktop
Expand Up @@ -144,15 +144,19 @@ input[disabled].input_text {
text-decoration: none;
}



/* the new "button" */
.new_posts, .new_posts:visited, .new_posts:link {
border-radius: 4px;
/* background: #43a8da; */
background: #7bb128;
color: #fff;
}
/* approval indicator */
.require_approval {
border-radius: 4px;
background: #f3b200;
color: #fff;
}

/* Standard horizontal rule.. ([hr], etc.) */
hr {
Expand Down Expand Up @@ -950,6 +954,9 @@ span.views_text {
.windowbg2 {
background-color: #fcfcfc;
}
.approvebg {
background-color: #fff5cd;
}
.board_stats {
text-align: left;
padding: 1px 6px 1px 0;
Expand Down Expand Up @@ -1423,4 +1430,4 @@ span.views_text {
#search_form * {
float: none;
}
}
}
6 changes: 6 additions & 0 deletions themes/default/css/_light/index_light.css
View file
Open in desktop
Expand Up @@ -157,6 +157,12 @@ input[disabled].input_text, input[disabled].input_password {
background: #5aa05e;
color: #fff;
}
/* approval indicator */
.require_approval {
border-radius: 4px;
background: #f3b200;
color: #fff;
}

/* Standard horizontal rule.. ([hr], etc.) */
hr {
Expand Down
8 changes: 4 additions & 4 deletions themes/default/css/index.css
View file
Open in desktop
Expand Up @@ -318,11 +318,11 @@ input[type=submit][disabled]:hover, button[disabled], button[disabled]:hover {
/* the new "button" */
/* @todo - Might add extra fallbacks. Possibly monospace. */
/* @todo - Also, look at deprecating spans here. */
.new_posts {
.new_posts, .require_approval {
font-weight: bold;
line-height: 1.12px;
}
.new_posts {
.new_posts, .require_approval {
display: inline;
padding: 1px 4px 2px 4px;
font-size: .643em;
Expand Down Expand Up @@ -3900,7 +3900,7 @@ a.help .icon {
min-width: 15em;
}
.board_latest {
min-width: 20em;
min-width: 22em;
width: 40%;
}
.lastpost_link {
Expand Down Expand Up @@ -3957,7 +3957,7 @@ a.help .icon {
text-overflow: ellipsis;
}
.board_latest {
min-width: 20em;
min-width: 22em;
}
.board_row {
min-width: 20em;
Expand Down