diff --git a/fp-interface/themes/leggero/leggero/res/column.css b/fp-interface/themes/leggero/leggero/res/column.css index e82334a..211c73a 100644 --- a/fp-interface/themes/leggero/leggero/res/column.css +++ b/fp-interface/themes/leggero/leggero/res/column.css @@ -14,7 +14,7 @@ Module: style.css /* ===== COLUMN ===== */ -#column { +.column { float: right; width: 195px !important; width: 180px; @@ -26,25 +26,25 @@ Module: style.css border-left: solid 1px #ccc } -#column h4 { +.column h4 { /* Titles of the sections */ margin-bottom: .5em; } -#column p, #column div { margin: 10px 5px } +.column p, .column div { margin: 10px 5px } -#column a:link, #column a:visited { color: gray } +.column a:link, .column a:visited { color: gray } /* === List === */ -#column ul li table { font-size: 100% } +.column ul li table { font-size: 100% } -#column ul { +.column ul { list-style-type: none; margin-right: 10px; margin-bottom: .5em; padding-left: 1em } -#column fieldset { margin: 0 5px 0 5px } +.column fieldset { margin: 0 5px 0 5px } -#column legend { font-size: 100% } +.column legend { font-size: 100% } diff --git a/fp-interface/themes/leggero/widgets.tpl b/fp-interface/themes/leggero/widgets.tpl index 2868282..3412a1f 100644 --- a/fp-interface/themes/leggero/widgets.tpl +++ b/fp-interface/themes/leggero/widgets.tpl @@ -1,20 +1,22 @@ -
+
{widgets pos=right}

{$subject}

{$content}
{/widgets} +
+
{widgets pos=left}

{$subject}

{$content}
{/widgets} +
-
diff --git a/fp-plugins/akismet/plugin.akismet.php b/fp-plugins/akismet/plugin.akismet.php index 1f7ca2f..ec1b1db 100644 --- a/fp-plugins/akismet/plugin.akismet.php +++ b/fp-plugins/akismet/plugin.akismet.php @@ -9,8 +9,6 @@ Author URI: http://flatpress.sf.net */ -// change 0 into your API key -//define('AKISMET_API_KEY', '0'); define('AKISMET_TIMEOUT', 10); require plugin_getdir('akismet') . '/inc/Akismet.class.php'; @@ -30,18 +28,18 @@ function plugin_akismet_validate(&$bool, $contents) { if (!$bool) return false; - global $blog_config; + global $fp_config; - $akismet = new Akismet($blog_config['WWW'], AKISMET_API_KEY); + $akismet = new Akismet($fp_config['general']['www'], $fp_config['plugins']['akismet']['apikey']); $akismet->setAuthor($contents['name']); $akismet->setAuthorEmail(isset($contents['email'])? $contents['email'] : ''); $akismet->setAuthorURL(isset($contents['url'])? $contents['url'] : ''); $akismet->setContent($contents['content']); if ($v= $akismet->isSpam()){ - global $_FP_SMARTY; - $_FP_SMARTY->assign('error', array('ERROR: Comment is invalid')); + global $smarty; + $smarty->assign('error', array('ERROR: Comment is invalid')); return false; } return true;