Permalink
Browse files

some CSS corrections

  • Loading branch information...
1 parent 1bdaad5 commit 0311e0d5019c1956310ab2009ce0494ce70baded @silvercircle committed Mar 23, 2015
View
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PhpUnit">
+ <phpunit_settings>
+ <PhpUnitSettings />
+ </phpunit_settings>
+ </component>
+</project>
View
@@ -6,7 +6,7 @@
* This software is a derived product, based on:
*
* Simple Machines Forum (SMF)
- * copyright: 2011 Simple Machines (http://www.simplemachines.org)
+ * copyright: 2015 Simple Machines (http://www.simplemachines.org)
* license: BSD, See included LICENSE.TXT for terms and conditions.
*
* @version 1.0pre
@@ -32,7 +32,7 @@ class EoS_Smarty {
private static $_is_Debug = false;
/**
- * @param bool $debug - true enables template debug mode
+ * @param bool $debug true enables template debug mode
*
* this initializes the smarty template system. Should be called early in index.php,
* but after all settings have been loaded, especially AFTER loadTheme()
@@ -182,7 +182,7 @@ public static function &getSmartyInstance()
* set up the template context, load and display the template
* this does everything needed to get our ouput
*/
- public static function Display()
+ private static function Display()
{
global $context;
@@ -208,19 +208,36 @@ public static function Display()
* prepares the template debug output with information from the template engine
* The special template admin/theme_debug.tpl will output it and is called via
* a template hook (theme_debug_output), by default in the footer template fragment.
+ *
+ * this function is only executed when $theme_use_debug is set to true in Settings.php
*/
- public static function prepareDebugContext()
+ private static function prepareDebugContext()
{
- global $context, $settings;
+ global $context, $settings, $txt;
+
loadLanguage('ThemeDebug');
$context['theme_debug'] = array(
'template_hooks' => self::$_configInstance->getHookDebugInfo(),
'template_dirs' => implode('<br>', self::$_smartyInstance->getTemplateDir(null)),
+ 'templates_used' => implode('<br>', self::$_template_names),
+ 'compile_dir' => self::$_smartyInstance->getCompileDir(),
+ 'default_theme_dir' => $settings['default_theme_dir'],
+ 'smarty_version' => Smarty::SMARTY_VERSION,
+ 'allow_overrides' => $settings['allow_template_overrides'] ? $txt['yes'] : $txt['no'],
+ 'primary_css' => $settings['primary_css'],
+ 'secondary_css' => $settings['secondary_css'],
);
}
- // Ends execution. Takes care of template loading and remembering the previous URL.
+ /**
+ * @param null $header
+ * @param null $do_footer
+ * @param bool $from_index
+ * @param bool $from_fatal_error
+ *
+ * output everything. This is the same as obExit in Subs.php except that it handles rendering via Smarty.
+ */
public static function obExit($header = null, $do_footer = null, $from_index = false, $from_fatal_error = false)
{
global $context, $modSettings;
@@ -298,7 +315,7 @@ public static function obExit($header = null, $do_footer = null, $from_index = f
exit;
}
- public static function template_header()
+ private static function template_header()
{
global $txt, $context, $user_info, $boarddir;
@@ -577,15 +577,20 @@ ul.plainbuttonlist li a {
}
ul.buttonlist li a, span.button, input[type=button], input[type=submit] {
float: left;
- height:21px !important;
- line-height:19px !important;
- padding: 0 6px 1px 6px;
+ height:24px !important;
+ line-height: 22px !important;
cursor: pointer;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
vertical-align: middle;
+ padding: 0 5px;
+}
+
+input[type=button], input[type=submit] {
+ line-height: inherit !important;
}
+
ul.buttonlist.vertical li a {
float:none;
display:block;
@@ -146,7 +146,7 @@ input[type="text"], input[type="password"], select {
border-radius: 3px;
font-family: "Lucida Sans Unicode", "Segoe UI", "Tahoma", "Arial", sans-serif;
font-size: 11px !important;
- line-height:11px !important;
+ line-height:13px !important;
box-shadow: 0 0 5px 0 #ddd inset;
}
textarea {
@@ -1077,28 +1077,28 @@ div#quickreplybox {
}
ul.buttonlist li a, span.button, input[type=button], input[type=submit] {
font-size: 11px !important;
- text-shadow: 1px 1px 1px #eee;
text-decoration: none;
color: #222;
- border: 1px solid white;
- background: #e2e2e2;
+ border: 1px solid blue;
+ background: #f2f2f2;
font-family:Tahoma,sans-serif;
vertical-align: middle;
- outline: 1px solid #999;
+ /*outline: 1px solid #999;*/
}
span.button.default, ul.buttonlist li a.active, input[type=submit].default {
background: #4685cc;
color:white;
text-shadow: none;
- border:1px solid white;
- outline: 1px solid #4685cc;
+ border:1px solid #4685cc;
+ /*outline: 1px solid #4685cc;*/
}
span.button:hover, ul.buttonlist li a:hover, input[type=submit]:hover {
- background: #ccc;
- border:1px solid orange !important;
+ background: #2665ac;
+ color: white;
+ /*border:1px solid orange !important;*/
}
input[type=submit].default:hover, span.button.default:hover, ul.buttonlist li a.active:hover, input[type=submit].default:active {
- border:1px solid orange !important;
+ /*border:1px solid orange !important;*/
background: #2665ac !important;
color:white;
}
@@ -1,5 +1,9 @@
<?php
-
$txt['theme_debug_title'] = 'Theme debug output (click to view details)';
-$txt['theme_debug_hooks'] = 'Hook summary:';
$txt['theme_debug_template_dirs'] = 'Template directories:';
+$txt['theme_debug_compile_dir'] = 'Compile (cache) directory:';
+$txt['theme_debug_default_dir'] = 'Default theme directory:';
+$txt['theme_debug_smarty_version'] = 'Smarty version:';
+$txt['theme_debug_templates_used'] = 'Templates used:';
+$txt['theme_debug_allow_overrides'] = 'Allow template overrides:';
+$txt['theme_debug_primary_css'] = 'Primary CSS:';
@@ -43,7 +43,7 @@
* This is a mandatory function a theme_support.php must always have. It must instantiate and return
* a class that inherits from EoS_Smarty_Template_Support and pass $smarty_instance to its CTOR.
*
- * @param $smarty_instance The Smarty Class instance
+ * @param $smarty_instance Smarty Class instance
* @return DefaultTheme
*/
function theme_support_autoload($smarty_instance)
@@ -73,13 +73,7 @@ public function __construct($smarty_instance)
public function testfunction($param)
{
- //global $context, $txt;
echo "We are in test function and this is our param: ", $param;
-
- /*
- * display a custom theme template from overrides/
- */
- //$this->_smarty_instance->display('overrides/foo.tpl');
}
/**
@@ -2,7 +2,26 @@
<strong><a href="#" onClick="$('#theme_debug_content').show(); return false;">{$T.theme_debug_title}</a></strong>
<div id="theme_debug_content" style="display:none; margin:10px;">
{$C.theme_debug.template_hooks}<br>
+
<strong><span class="alert">{$T.theme_debug_template_dirs}</span></strong><br>
- {$C.theme_debug.template_dirs}
+ {$C.theme_debug.template_dirs}<br>
+
+ <strong><span class="alert">{$T.theme_debug_templates_used}</span></strong><br>
+ {$C.theme_debug.templates_used}<br>
+
+ <strong><span class="alert">{$T.theme_debug_compile_dir}</span></strong>&nbsp;
+ {$C.theme_debug.compile_dir}<br>
+
+ <strong><span class="alert">{$T.theme_debug_default_dir}</span></strong>&nbsp;
+ {$C.theme_debug.default_theme_dir}<br>
+
+ <strong><span class="alert">{$T.theme_debug_primary_css}</span></strong>&nbsp;
+ {$C.theme_debug.primary_css}<br>
+
+ <strong><span class="alert">{$T.theme_debug_allow_overrides}</span></strong>&nbsp;
+ {$C.theme_debug.allow_overrides}<br>
+
+ <strong><span class="alert">{$T.theme_debug_smarty_version}</span></strong>&nbsp;
+ {$C.theme_debug.smarty_version}<br>
</div>
</div>
@@ -41,14 +41,12 @@
</div>
{/function}
<div class="main_section" id="memberlist">
- <div class="cat_bar">
- <h3>
- {$T.members_list}
- {if !isset($C.old_search)}
- <span class="floatright">{$C.letter_links}</span>
- {/if}
- </h3>
- </div>
+ <h1 class="bigheader section_header">
+ {$T.members_list}
+ {if !isset($C.old_search)}
+ <span class="floatright">{$C.letter_links}</span>
+ {/if}
+ </h1>
<div class="flat_container cleantop smallpadding">
{if isset($C.page_index)}
<div class="pagelinks pagesection">{$C.page_index}</div>

0 comments on commit 0311e0d

Please sign in to comment.