Skip to content

Commit

Permalink
Updates to the current version for Alien.
Browse files Browse the repository at this point in the history 
Signed-off-by: Norv <a.w.norv@gmail.com>
  • Loading branch information
@norv
norv committed Apr 2, 2013
1 parent 47d978f commit 9805fab
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 33 deletions.
12 changes: 6 additions & 6 deletions themes/alien/BoardIndex.template.php
View file
Expand Up @@ -16,7 +16,7 @@

function template_main()
{
global $context, $settings, $options, $txt, $scripturl, $modSettings;
global $context, $settings, $options, $txt, $scripturl;

// Show some statistics if stat info is off.
if (!$settings['show_stats_index'])
Expand All @@ -43,8 +43,8 @@ function template_main()
</li>
</ul>
</div>
<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/fader.js"></script>
<script type="text/javascript"><!-- // --><![CDATA[
<script src="', $settings['default_theme_url'], '/scripts/fader.js"></script>
<script><!-- // --><![CDATA[
// Create a news fader object.
var oNewsFader = new smc_NewsFader({
Expand Down Expand Up @@ -151,7 +151,7 @@ function template_main()
</a>
</td>
<td class="info">
<a class="subject" href="', $board['href'], '" name="b', $board['id'], '">', $board['name'], '</a>';
<a class="subject" href="', $board['href'], '" id="b', $board['id'], '">', $board['name'], '</a>';

// Has it outstanding posts for approval?
if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
Expand Down Expand Up @@ -246,7 +246,7 @@ function template_main()

function template_info_center()
{
global $context, $settings, $options, $txt, $scripturl, $modSettings;
global $context, $settings, $txt, $scripturl, $modSettings;

// Here's where the "Info Center" starts...
echo '
Expand Down Expand Up @@ -437,7 +437,7 @@ function template_info_center()

// Info center collapse object.
echo '
<script type="text/javascript"><!-- // --><![CDATA[
<script><!-- // --><![CDATA[
var oInfoCenterToggle = new smc_Toggle({
bToggleEnabled: true,
bCurrentlyCollapsed: ', empty($context['minmax_preferences']['info']) ? 'false' : 'true', ',
Expand Down
1 change: 0 additions & 1 deletion themes/alien/css/admin.css
View file
Expand Up @@ -850,7 +850,6 @@ dl.right dt {
#manage_maintenance p {
margin: -5px 0 0 0;
padding: 0 0 10px 0;
max-width: 70em;
}
#manage_maintenance p .button_submit{
margin: 10px 10px 0px 10px;
Expand Down
93 changes: 82 additions & 11 deletions themes/alien/css/index.css
View file
Expand Up @@ -1093,7 +1093,7 @@ img.sort {
margin-left: 19950px;
}
/* Cancel those for hover and/or js access. */
.dropmenu ul li:hover a:focus, .dropmenu ul li.sfhover a:focus {
.dropmenu ul li:hover a:focus, .dropmenu ul li.sfhover a:focus, .dropmenu li li a:focus {
margin-left: 0;
width: auto;
}
Expand Down Expand Up @@ -1137,7 +1137,7 @@ img.sort {
.dropmenu li li:hover ul, .dropmenu li li.sfhover ul {
left: -14px;
}
.dropmenu li li.subsections a:after, .adm_section .dropmenu li.subsections a:after{
.dropmenu li li.subsections a:after, .adm_section .dropmenu li.subsections a:after {
position: absolute;
top: 0.4em;
right: 2px;
Expand Down Expand Up @@ -1665,7 +1665,7 @@ ul li.greeting {
padding: 8px 0 0 0;
width: 5%;
min-width: 50px;
/*Top aligned is much nicer for the icon. */
/* Top aligned is much nicer for the icon. */
vertical-align: top;
border-left: 1px solid #ddd;
text-align: center;
Expand Down Expand Up @@ -2065,6 +2065,11 @@ div#pollmoderation {
word-break: hyphenate;
word-wrap: break-word;
}
.poster2 {
width: auto;
max-width: 25em;
font-size: 1em;
}
.poster span.name {
display: block;
padding: 6px;
Expand Down Expand Up @@ -2138,8 +2143,8 @@ div#pollmoderation {
padding: 0 10px 0 10px;
}
.poster .dropmenu li ul li.report_link, .poster .dropmenu li ul li.issue_warning, .poster .dropmenu li ul li.poster_ip {
margin: 0 0 0 0;
padding: 0 0 0 0;
margin: 0;
padding: 0;
float: left;
width: 100%;
font-size: 1.1em;
Expand All @@ -2150,6 +2155,13 @@ div#pollmoderation {
background: #ccc;
box-shadow: 0 -1px 0 #fff inset;
}
.poster .dropmenu li ul li.warning a, .poster .dropmenu li ul li.warning img {
width: auto;
display: table-cell;
vertical-align: middle;
padding: 0 4px;
line-height: 1.4em;
}
.poster .dropmenu li ul li hr {
margin: 4px 3px;
}
Expand Down Expand Up @@ -2198,6 +2210,9 @@ div#pollmoderation {
.poster img {
vertical-align: middle;
}
.avatar img {
border: 0;
}

/* End nifty new flyout. */

Expand Down Expand Up @@ -2236,6 +2251,9 @@ div#pollmoderation {
.groupicon img {
padding: 0 3px 0 3px;
}
.keyinfo {
margin-bottom: 2px;
}
.keyinfo h5 {
color: #555;
padding: 1px 0 5px 0;
Expand Down Expand Up @@ -2356,6 +2374,15 @@ ul.quickbuttons li a.details_button {
ul.quickbuttons li a.ignore_button {
background: url(../images/theme/quickbuttons.png) no-repeat 1px -288px;
}
ul.quickbuttons li a.report_button {
background: url(../images/theme/quickbuttons.png) no-repeat 1px -312px;
}
ul.quickbuttons li a.warn_button {
background: url(../images/theme/quickbuttons.png) no-repeat 1px -336px;
}
ul.quickbuttons li a.quotetonew_button {
background: url(../images/theme/quickbuttons.png) no-repeat 1px -360px;
}
ul.quickbuttons li.inline_mod_check {
padding: 1px 1px 1px 1px;
}
Expand Down Expand Up @@ -2429,7 +2456,8 @@ ul.quickbuttons li.inline_mod_check {
border-left: solid 1px #aaa;
border-top: solid 1px #bbb;
border-radius: 4px 2px 4px 0;
box-shadow: 2px 3px 3px rgba(0,0,0,0.2);
box-shadow: 2px 3px 3px rgba(0, 0 ,0, 0.2);
white-space: nowrap;
}
.quickbuttons li:hover ul, .quickbuttons li.sfhover ul {
left: auto;
Expand All @@ -2440,7 +2468,7 @@ ul.quickbuttons li.inline_mod_check {
background: none;
border: none;
box-shadow: none;
width: 12em;
width: 12.5em;
border: 1px solid transparent;
border-radius: 3px;
}
Expand All @@ -2457,6 +2485,28 @@ ul.quickbuttons li.inline_mod_check {
width: 12em;
-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
}
li.quote, .follow_ups li {
position: relative;
padding: 0 4px;
line-height: 2.0em;
}
.follow_ups li:first-child {
border-radius: 4px;
margin-right: 0.75em;
}
ul.follow_ups li a, ul.follow_ups li a:hover {
padding: 0;
white-space: normal;
}
ul.follow_ups {
float: none;
width: auto;
margin: 0;
padding: 0;
}
ul.follow_ups>li {
margin-top: -5px;
}
/* Note: The next declarations are for keyboard access with js disabled. */
.quickbuttons ul li a:focus {
margin: 0 -9910px 0 9910px;
Expand Down Expand Up @@ -2759,12 +2809,12 @@ ul.post_options li {
#move_topic dl.settings dd {
width: 59%;
}
.move_topic {
.split_topics, .move_topic {
width: 710px;
margin: auto;
text-align: left;
}
div.move_topic fieldset {
div.split_topics fieldset, div.move_topic fieldset {
padding: 6px;
}

Expand Down Expand Up @@ -3389,10 +3439,18 @@ img.centericon {
}

/*Issue a warning*/
#warn_body{
#warn_body {
width: 80%;
font-size: 0.9em;
}
#warning_text {
padding-top: 1pt;
width: 100%;
z-index: 2;
color: black;
position: absolute;
font-weight: bold;
}

/* Styles for the statistics center.
------------------------------------------------- */
Expand Down Expand Up @@ -3727,6 +3785,9 @@ span.hidelink {
background: #D0F3E0;
color: #222;
}
table.calendar_table {
border-spacing: 1px;
}

/* Styles for the memberlist section.
------------------------------------------------- */
Expand Down Expand Up @@ -4191,6 +4252,16 @@ span.hidelink {
.table_grid tr.catbg th.centercol, .table_grid tr.windowbg2 td.centercol, .table_grid tr.windowbg td.centercol, .table_grid tr.highlight2 td.centercol {
text-align: center;
}
.table_grid tr.catbg th.lefttext, .table_grid tr.windowbg2 td.lefttext, .table_grid tr.windowbg td.lefttext, .table_grid tr.highlight2 td.lefttext {
margin-left: 0;
margin-right: auto;
text-align: left;
}
.table_grid tr.catbg th.righttext, .table_grid tr.windowbg2 td.righttext, .table_grid tr.windowbg td.righttext, .table_grid tr.highlight2 td.righttext {
margin-left: auto;
margin-right: 0;
text-align: right;
}
#show_attachments th {
text-align: left;
}
Expand Down Expand Up @@ -4389,4 +4460,4 @@ tr.catbg th:last-child, #show_attachments th:last-child {
.approvetbg2 {
color: #222;
background: #e0ccc1;
}
}
39 changes: 24 additions & 15 deletions themes/alien/index.template.php
View file
Expand Up @@ -81,9 +81,10 @@ function template_html_above()
global $context, $settings, $scripturl, $txt, $modSettings;

// Show right to left and the character set for ease of translating.
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"', $context['right_to_left'] ? ' dir="rtl"' : '', '>
<head>';
echo '<!DOCTYPE html>
<html ', $context['right_to_left'] ? ' dir="rtl"' : '', '>
<head>
<title>', $context['page_title_html_safe'], '</title>';

// Tell IE to render the page in standards not compatibility mode. really for ie >= 8
// Note if this is not in the first 4k, its ignored, thats why its here
Expand All @@ -97,31 +98,33 @@ function template_html_above()
// Save some database hits, if a width for multiple wrappers is set in admin.
if (!empty($settings['forum_width']))
echo '
<style type="text/css">#wrapper, .frame {width: ', $settings['forum_width'], ';}</style>';
<style>
#wrapper, .frame {
width: ', $settings['forum_width'], ';
}
</style>';

// Quick and dirty testing of RTL horrors. Remove before production build.
//echo '
//<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/rtl.css?alp21" />';
//<link rel="stylesheet" href="', $settings['theme_url'], '/css/rtl.css?alp21" />';

// RTL languages require an additional stylesheet.
if ($context['right_to_left'])
{
echo '
<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/rtl.css?alp21" />';
<link rel="stylesheet" href="', $settings['theme_url'], '/css/rtl.css?alp21" />';

if (!empty($context['theme_variant']))
echo '
<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/rtl', $context['theme_variant'], '.css?alp21" />';
<link rel="stylesheet" href="', $settings['theme_url'], '/css/rtl', $context['theme_variant'], '.css?alp21" />';
}

echo '
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width" />
<meta name="description" content="', $context['page_title_html_safe'], '" />', !empty($context['meta_keywords']) ? '
<meta name="keywords" content="' . $context['meta_keywords'] . '" />' : '';

echo '
<title>', $context['page_title_html_safe'], '</title>';

// Please don't index these Mr Robot.
if (!empty($context['robot_no_index']))
echo '
Expand Down Expand Up @@ -166,6 +169,12 @@ function template_html_above()
// Output any remaining HTML headers. (from mods, maybe?)
echo $context['html_headers'];

// A little help for our friends
echo '
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->';

echo '
</head>
<body id="', $context['browser_body_id'], '" class="action_', !empty($context['current_action']) ? htmlspecialchars($context['current_action']) : (!empty($context['current_board']) ?
Expand Down Expand Up @@ -278,7 +287,7 @@ function template_body_above()
if (!empty($context['show_login_bar']))
{
echo '
<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
<script src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
<form id="guest_form" action="', $scripturl, '?action=login2;quicklogin" method="post" accept-charset="UTF-8" ', empty($context['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $context['session_id'] . '\', \'' . (!empty($context['login_token']) ? $context['login_token'] : '') . '\');"' : '', '>
<input type="text" name="user" size="10" class="input_text" />
<input type="password" name="passwrd" size="10" class="input_password" />
Expand Down Expand Up @@ -406,7 +415,7 @@ function template_html_below()
*/
function theme_linktree($force_show = false)
{
global $context, $settings, $options, $shown_linktree, $scripturl, $txt;
global $context, $settings, $shown_linktree, $scripturl, $txt;

// If linktree is empty, just return - also allow an override.
if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
Expand Down Expand Up @@ -534,7 +543,7 @@ function template_menu()
// Define the upper_section toggle in JavaScript.
// Note that this definition had to be shifted for the js to work with the new markup.
echo '
<script type="text/javascript"><!-- // --><![CDATA[
<script><!-- // --><![CDATA[
var oMainHeaderToggle = new smc_Toggle({
bToggleEnabled: true,
bCurrentlyCollapsed: ', empty($context['minmax_preferences']['upshrink']) ? 'false' : 'true', ',
Expand Down Expand Up @@ -573,7 +582,7 @@ function template_menu()
*/
function template_button_strip($button_strip, $direction = '', $strip_options = array())
{
global $settings, $context, $txt, $scripturl;
global $context, $txt;

if (!is_array($strip_options))
$strip_options = array();
Expand Down Expand Up @@ -660,7 +669,7 @@ function template_select_boards($name, $label = '', $extra = '')

foreach ($category['boards'] as $board)
echo '
<option value="', $board['id'], '"', !empty($board['selected']) ? ' selected="selected"' : '', !empty($context['current_board']) && $board['id'] == $context['current_board'] ? ' disabled="disabled"' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
<option value="', $board['id'], '"', !empty($board['selected']) ? ' selected="selected"' : '', !empty($context['current_board']) && $board['id'] == $context['current_board'] && $context['boards_current_disabled'] ? ' disabled="disabled"' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
echo '
</optgroup>';
}
Expand Down

0 comments on commit 9805fab

Please sign in to comment.