From 04996a152f76cb002486da8dd7d9f5c53683f370 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Wed, 25 Jan 2006 19:26:58 +0000 Subject: [PATCH] Add experimental MySQL5 SET NAMES support --- docs/NEWS | 12 +- include/db/mysql.inc.php | 16 +- include/db/mysqli.inc.php | 12 +- lang/UTF-8/recode.php | 7 + lang/UTF-8/serendipity_lang_bg.inc.php | 1 + lang/UTF-8/serendipity_lang_cn.inc.php | 1 + lang/UTF-8/serendipity_lang_cs.inc.php | 1 + lang/UTF-8/serendipity_lang_cz.inc.php | 1 + lang/UTF-8/serendipity_lang_da.inc.php | 1 + lang/UTF-8/serendipity_lang_de.inc.php | 1 + lang/UTF-8/serendipity_lang_en.inc.php | 1 + lang/UTF-8/serendipity_lang_es.inc.php | 1 + lang/UTF-8/serendipity_lang_fa.inc.php | 1 + lang/UTF-8/serendipity_lang_fi.inc.php | 1 + lang/UTF-8/serendipity_lang_fr.inc.php | 1 + lang/UTF-8/serendipity_lang_hu.inc.php | 1 + lang/UTF-8/serendipity_lang_is.inc.php | 3 +- lang/UTF-8/serendipity_lang_it.inc.php | 1 + lang/UTF-8/serendipity_lang_ja.inc.php | 1 + lang/UTF-8/serendipity_lang_ko.inc.php | 1 + lang/UTF-8/serendipity_lang_nl.inc.php | 1 + lang/UTF-8/serendipity_lang_no.inc.php | 1 + lang/UTF-8/serendipity_lang_pt.inc.php | 1 + lang/UTF-8/serendipity_lang_pt_PT.inc.php | 1 + lang/UTF-8/serendipity_lang_ro.inc.php | 1 + lang/UTF-8/serendipity_lang_ru.inc.php | 3 +- lang/UTF-8/serendipity_lang_se.inc.php | 1 + lang/UTF-8/serendipity_lang_tn.inc.php | 1 + lang/UTF-8/serendipity_lang_tw.inc.php | 1 + lang/UTF-8/serendipity_lang_zh.inc.php | 1 + lang/serendipity_lang_bg.inc.php | 1 + lang/serendipity_lang_cn.inc.php | 1 + lang/serendipity_lang_cs.inc.php | 1 + lang/serendipity_lang_cz.inc.php | 1 + lang/serendipity_lang_da.inc.php | 1 + lang/serendipity_lang_de.inc.php | 1 + lang/serendipity_lang_en.inc.php | 1 + lang/serendipity_lang_es.inc.php | 1 + lang/serendipity_lang_fa.inc.php | 1 + lang/serendipity_lang_fi.inc.php | 1 + lang/serendipity_lang_fr.inc.php | 1 + lang/serendipity_lang_hu.inc.php | 1 + lang/serendipity_lang_is.inc.php | 1 + lang/serendipity_lang_it.inc.php | 1 + lang/serendipity_lang_ja.inc.php | 1 + lang/serendipity_lang_ko.inc.php | 1 + lang/serendipity_lang_nl.inc.php | 1 + lang/serendipity_lang_no.inc.php | 1 + lang/serendipity_lang_pt.inc.php | 1 + lang/serendipity_lang_pt_PT.inc.php | 1 + lang/serendipity_lang_ro.inc.php | 1 + lang/serendipity_lang_ru.inc.php | 3 +- lang/serendipity_lang_se.inc.php | 1 + lang/serendipity_lang_tn.inc.php | 1 + lang/serendipity_lang_tw.inc.php | 1 + lang/serendipity_lang_zh.inc.php | 1 + .../admin/img/menuheader_background.png | Bin 1135 -> 213 bytes templates/default/admin/style.css | 255 ++++++----- templates/default/entries.tpl | 2 + templates/default/img/back.png | Bin 468 -> 673 bytes templates/default/img/forward.png | Bin 477 -> 686 bytes templates/default/img/xml.gif | Bin 111 -> 597 bytes templates/default/index.tpl | 9 +- templates/default/plugin_calendar.tpl | 6 +- templates/default/style.css | 418 +++++++++++------- 65 files changed, 500 insertions(+), 295 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index f4d429d..7192cba 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,16 +3,20 @@ Version 1.0-beta2 () ------------------------------------------------------------------------ + * Added experimental MySQL5 "SET NAMES" support. Needs to be enabled + by setting $serendipity['dbNames'] = true somehwere (like + serendipity_config_local.inc.php) (garvinhicking) + * Patch bundled PEAR.php so that it does not try to declare a PEAR class a second time. (garvinhicking) * RSS feeds use the permalink URL to link to extended entry, not the RSS guid element. (garvinhicking) - + * Remove duplicate path file name in serendipity_currentURL function, preventing the right "is frontpage?" detection routine from working. (garvinhicking) - + * Use mysql_real_escape_string when available (garvinhicking) * Atom feeds now use proper appliaction-mime type header, thanks to @@ -20,7 +24,7 @@ Version 1.0-beta2 () * MoveableType importer no longer chokes on "FM/EM" timestamps (garvinhicking) - + * Fix undefined function call to "is_defined". * Added translation helper tool plugin_lang.php to detect untranslated @@ -50,7 +54,7 @@ Version 1.0-beta1 (January 23rd, 2006) serendipity_fetchEntries() function call for further abstraction. (garvinhicking) - * Add new plugin hook "backend_http_request" which passes PEAR + * Add new plugin hook "backend_http_request" which passes PEAR HTTP_Request options to plugins for modification. $addData contains the source of where a request is being made (garvinhicking) diff --git a/include/db/mysql.inc.php b/include/db/mysql.inc.php index 2533231..7056da4 100644 --- a/include/db/mysql.inc.php +++ b/include/db/mysql.inc.php @@ -250,6 +250,10 @@ function serendipity_db_connect() { $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']); mysql_select_db($serendipity['dbName']); + if (defined('SQL_CHARSET') && $serendipity['dbNames']) { + mysql_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']); + } + return $serendipity['dbConn']; } @@ -264,22 +268,22 @@ function serendipity_db_schema_import($query) { static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}'); static $replace = array('int(11) not null auto_increment', 'primary key', - 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); + 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); static $is_utf8 = null; global $serendipity; - + if ($is_utf8 === null) { - $search[] = '{UTF_8}'; - if ( (isset($_POST['charset']) && $_POST['charset'] == 'UTF-8/') || + $search[] = '{UTF_8}'; + if ( (isset($_POST['charset']) && $_POST['charset'] == 'UTF-8/') || $serendipity['charset'] == 'UTF-8/' || - $serendipity['POST']['charset'] == 'UTF-8/' || + $serendipity['POST']['charset'] == 'UTF-8/' || LANG_CHARSET == 'UTF-8' ) { $replace[] = '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */'; } else { $replace[] = ''; } } - + $query = trim(str_replace($search, $replace, $query)); if ($query{0} == '@') { diff --git a/include/db/mysqli.inc.php b/include/db/mysqli.inc.php index d11ab37..d46ac27 100644 --- a/include/db/mysqli.inc.php +++ b/include/db/mysqli.inc.php @@ -233,6 +233,10 @@ function serendipity_db_connect() { $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']); mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']); + if (defined('SQL_CHARSET') && $serendipity['dbNames']) { + mysqli_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']); + } + return $serendipity['dbConn']; } @@ -250,12 +254,12 @@ function serendipity_db_schema_import($query) { 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); static $is_utf8 = null; global $serendipity; - + if ($is_utf8 === null) { - $search[] = '{UTF_8}'; - if ( $_POST['charset'] == 'UTF-8/' || + $search[] = '{UTF_8}'; + if ( $_POST['charset'] == 'UTF-8/' || $serendipity['charset'] == 'UTF-8/' || - $serendipity['POST']['charset'] == 'UTF-8/' || + $serendipity['POST']['charset'] == 'UTF-8/' || LANG_CHARSET == 'UTF-8' ) { $replace[] = '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */'; } else { diff --git a/lang/UTF-8/recode.php b/lang/UTF-8/recode.php index 68f2841..033918b 100644 --- a/lang/UTF-8/recode.php +++ b/lang/UTF-8/recode.php @@ -70,6 +70,13 @@ while (($file = readdir($dh)) !== false) { $fc ); } + + $fc = preg_replace( + '@define\(\'SQL_CHARSET\',\s+\'[^\']+\'\);@i', + "define('SQL_CHARSET', 'utf8');", + $fc + ); + $fc = str_replace(array_keys($sr), array_values($sr), $fc); $fp = fopen($file, 'w'); fwrite($fp, $fc); diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index 32bbf74..9369b49 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -7,6 +7,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'bg_BG'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('WYSIWYG_LANG', 'en'); diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index f7db0ab..1fd64dc 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php index 5f5bee7..9c596fa 100644 --- a/lang/UTF-8/serendipity_lang_cs.inc.php +++ b/lang/UTF-8/serendipity_lang_cs.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'cs_CZ.UTF-8, czech, cs'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M'); diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index 9bb1870..410480d 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'cs_CZ.UTF-8, cs_CZ.UTF8, czech, cs'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M'); diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index e6e81a7..0ed61e9 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -7,6 +7,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'da_DK.UTF8, da_DK.UTF-8, danish, da, da_DK'); @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 3991ddf..9fdcc97 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'de_DE.UTF-8, de_DE.UTF8, german, de_DE, de_DE@euro, de'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php index 3bdd0a6..6108016 100644 --- a/lang/UTF-8/serendipity_lang_en.inc.php +++ b/lang/UTF-8/serendipity_lang_en.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'en_US-UTF-8, en_US-UTF8, english, en, en_US'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_es.inc.php b/lang/UTF-8/serendipity_lang_es.inc.php index 744e603..6db231d 100644 --- a/lang/UTF-8/serendipity_lang_es.inc.php +++ b/lang/UTF-8/serendipity_lang_es.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'es_ES.ISO_8859-15, es_ES.UTF8, es_ES.ISO_8859-1, es_ES.ISO8859-1, spanish, sp, es, es_ES, es-ES'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B del %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php index b73247f..f572fe1 100644 --- a/lang/UTF-8/serendipity_lang_fa.inc.php +++ b/lang/UTF-8/serendipity_lang_fa.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'fa_IR.UTF-8, fa_IR, persian, fa'); @define('DATE_FORMAT_ENTRY', '%A، %e %B %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php index 9680537..21c3757 100644 --- a/lang/UTF-8/serendipity_lang_fi.inc.php +++ b/lang/UTF-8/serendipity_lang_fi.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'fi_FI.UTF-8, finnish, fi'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php index 5595030..f5dad8a 100644 --- a/lang/UTF-8/serendipity_lang_fr.inc.php +++ b/lang/UTF-8/serendipity_lang_fr.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'fr_FR.UTF-8, fr_FR.UTF8, french, fr, fr_FR, fr_FR@euro, en_US'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php index 78be591..46aa312 100644 --- a/lang/UTF-8/serendipity_lang_hu.inc.php +++ b/lang/UTF-8/serendipity_lang_hu.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'hu_HU-UTF-8, hu_HU-UTF8, hungarian, hu, hu_HU'); @define('DATE_FORMAT_ENTRY', '%Y. %B %e. (%A) '); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php index 1556fcb..d3b9d1a 100644 --- a/lang/UTF-8/serendipity_lang_is.inc.php +++ b/lang/UTF-8/serendipity_lang_is.inc.php @@ -1,10 +1,11 @@ - /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'is_IS-UTF-8, is_IS-UTF8, icelandic, is, is_IS'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php index 0d9f30f..464e9e9 100644 --- a/lang/UTF-8/serendipity_lang_it.inc.php +++ b/lang/UTF-8/serendipity_lang_it.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'it_IT-UTF-8, it_IT-UTF8, italiano, it, it_IT'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php index ab21f8c..443083c 100644 --- a/lang/UTF-8/serendipity_lang_ja.inc.php +++ b/lang/UTF-8/serendipity_lang_ja.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ja_JP.UTF-8,ja,jp'); @define('DATE_FORMAT_ENTRY', '%Y年 %B %e(%A)'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php index a7d90bb..fffbb04 100644 --- a/lang/UTF-8/serendipity_lang_ko.inc.php +++ b/lang/UTF-8/serendipity_lang_ko.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ko_KR.UTF-8, korean, ko, ko_KR'); @define('DATE_FORMAT_ENTRY', '%Y년 %B %e일 %A'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php index 47e07cc..ddb3947 100644 --- a/lang/UTF-8/serendipity_lang_nl.inc.php +++ b/lang/UTF-8/serendipity_lang_nl.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'nl_BE.UTF8, nl_BE.UTF-8, dutch, nl_BE, nl'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php index 5dbb75f..1da2ffa 100644 --- a/lang/UTF-8/serendipity_lang_no.inc.php +++ b/lang/UTF-8/serendipity_lang_no.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'no_NO.UTF-8, no_NO.UTF8, norwegian, no, no_NO, no_'); @define('DATE_FORMAT_ENTRY', '%A - %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php index ae0c25d..6e3b785 100644 --- a/lang/UTF-8/serendipity_lang_pt.inc.php +++ b/lang/UTF-8/serendipity_lang_pt.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'pt_BR-UTF-8, pt_BR-UTF8, pt_BR, portuguese brazilian, pt'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y'); @define('WYSIWYG_LANG', 'pt_pt-utf'); diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php index 347ba87..27871ed 100644 --- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php +++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'pt_PT-UTF-8, pt_PT-UTF8, pt, pt_PT, european portuguese'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php index 9a71b77..5c00fcf 100644 --- a/lang/UTF-8/serendipity_lang_ro.inc.php +++ b/lang/UTF-8/serendipity_lang_ro.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ro_RO.UTF-8, romanian, ro, ro_RO'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php index 2caa7e2..cc5e240 100644 --- a/lang/UTF-8/serendipity_lang_ru.inc.php +++ b/lang/UTF-8/serendipity_lang_ru.inc.php @@ -4,7 +4,8 @@ # Translation by Nightly /* vim: set sts=4 ts=4 expandtab : */ -@define('LANG_CHARSET', 'utf-8'); +@define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ru_RU.utf-8'); @define('DATE_FORMAT_ENTRY', '%A, %e %B. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php index 12d88f2..f926bc4 100644 --- a/lang/UTF-8/serendipity_lang_se.inc.php +++ b/lang/UTF-8/serendipity_lang_se.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'sv_SV.UTF8, sv_SV.UTF-8, swedish, sv, sv_SV'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php index 4c6478b..37e49e7 100644 --- a/lang/UTF-8/serendipity_lang_tn.inc.php +++ b/lang/UTF-8/serendipity_lang_tn.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'zh-TW.UTF-8, zh_TW.UTF-8, tw, zh'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php index cb9cc9c..989754a 100644 --- a/lang/UTF-8/serendipity_lang_tw.inc.php +++ b/lang/UTF-8/serendipity_lang_tw.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'tw, zh, zh-TW, zh_TW'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php index f08dea5..8e8b697 100644 --- a/lang/UTF-8/serendipity_lang_zh.inc.php +++ b/lang/UTF-8/serendipity_lang_zh.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh, zh_GB, zh_CN'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php index c9f57e1..6f1e2b9 100644 --- a/lang/serendipity_lang_bg.inc.php +++ b/lang/serendipity_lang_bg.inc.php @@ -7,6 +7,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'windows-1251'); +@define('SQL_CHARSET', 'cp1251'); @define('DATE_LOCALES', 'bg_BG'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('WYSIWYG_LANG', 'en'); diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php index 5ff6f47..ab64272 100644 --- a/lang/serendipity_lang_cn.inc.php +++ b/lang/serendipity_lang_cn.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php index 62290eb..4dc777c 100644 --- a/lang/serendipity_lang_cs.inc.php +++ b/lang/serendipity_lang_cs.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'windows-1250'); +@define('SQL_CHARSET', 'cp1250'); @define('DATE_LOCALES', 'cs_CZ.windows-1250, czech, cs'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M'); diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php index 1d14912..30b4d02 100644 --- a/lang/serendipity_lang_cz.inc.php +++ b/lang/serendipity_lang_cz.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-2'); +@define('SQL_CHARSET', 'latin2'); @define('DATE_LOCALES', 'cs_CZ.ISO-8859-2, cs_CZ.ISO8859-2, czech, cs'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M'); diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php index 355e6ed..872573e 100644 --- a/lang/serendipity_lang_da.inc.php +++ b/lang/serendipity_lang_da.inc.php @@ -7,6 +7,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'da_DK.ISO8859-1, da_DK.ISO-8859-1, danish, da, da_DK'); @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index f26c1ae..0275357 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'de_DE.ISO-8859-1, de_DE.ISO8859-1, german, de_DE, de_DE@euro, de'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index f4cbe99..12c3bef 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'en_US-ISO-8859-1, en_US-ISO8859-1, english, en, en_US'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php index dcd066b..4664b55 100644 --- a/lang/serendipity_lang_es.inc.php +++ b/lang/serendipity_lang_es.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-15'); +@define('SQL_CHARSET', 'latin2'); @define('DATE_LOCALES', 'es_ES.ISO_8859-15, es_ES.ISO8859-15, es_ES.ISO_8859-1, es_ES.ISO8859-1, spanish, sp, es, es_ES, es-ES'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B del %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php index 6b69283..d7ec3e5 100644 --- a/lang/serendipity_lang_fa.inc.php +++ b/lang/serendipity_lang_fa.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'fa_IR.UTF-8, fa_IR, persian, fa'); @define('DATE_FORMAT_ENTRY', '%A، %e %B %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php index 2821bb3..00f3569 100644 --- a/lang/serendipity_lang_fi.inc.php +++ b/lang/serendipity_lang_fi.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'fi_FI.UTF-8, finnish, fi'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php index e4d2f54..c2786f0 100644 --- a/lang/serendipity_lang_fr.inc.php +++ b/lang/serendipity_lang_fr.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'fr_FR.ISO-8859-1, fr_FR.ISO8859-1, french, fr, fr_FR, fr_FR@euro, en_US'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php index 2e236d2..49ed313 100644 --- a/lang/serendipity_lang_hu.inc.php +++ b/lang/serendipity_lang_hu.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-2'); +@define('SQL_CHARSET', 'latin2'); @define('DATE_LOCALES', 'hu_HU-ISO-8859-2, hu_HU-ISO8859-2, hungarian, hu, hu_HU'); @define('DATE_FORMAT_ENTRY', '%Y. %B %e. (%A) '); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php index bda79c9..b196ab4 100644 --- a/lang/serendipity_lang_is.inc.php +++ b/lang/serendipity_lang_is.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'is_IS-ISO-8859-1, is_IS-ISO8859-1, icelandic, is, is_IS'); @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%y %H:%M'); diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php index 49cbab2..8298096 100644 --- a/lang/serendipity_lang_it.inc.php +++ b/lang/serendipity_lang_it.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'it_IT-ISO-8859-1, it_IT-ISO8859-1, italiano, it, it_IT'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php index 40f8a60..f16817b 100644 --- a/lang/serendipity_lang_ja.inc.php +++ b/lang/serendipity_lang_ja.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ja_JP.UTF-8,ja,jp'); @define('DATE_FORMAT_ENTRY', '%Y年 %B %e(%A)'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index 62e9a9e..359d573 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ko_KR.UTF-8, korean, ko, ko_KR'); @define('DATE_FORMAT_ENTRY', '%Y년 %B %e일 %A'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index a90a2ec..d7ff9ba 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'nl_BE.ISO8859-1, nl_BE.ISO-8859-1, dutch, nl_BE, nl'); @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index 8def933..51a7edb 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'no_NO.ISO-8859-1, no_NO.ISO8859-1, norwegian, no, no_NO, no_'); @define('DATE_FORMAT_ENTRY', '%A - %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index a874e8b..6d60433 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'pt_BR-ISO-8859-1, pt_BR-ISO8859-1, pt_BR, portuguese brazilian, pt'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y'); @define('WYSIWYG_LANG', 'pt_pt'); diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index dab7c1b..91a5276 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -8,6 +8,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'pt_PT-ISO-8859-1, pt_PT-ISO8859-1, pt, pt_PT, european portuguese'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index 9a71b77..5c00fcf 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ro_RO.UTF-8, romanian, ro, ro_RO'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M'); diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index b1c5d65..01afdac 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -4,7 +4,8 @@ # Translation by Nightly /* vim: set sts=4 ts=4 expandtab : */ -@define('LANG_CHARSET', 'utf-8'); +@define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'ru_RU.utf-8'); @define('DATE_FORMAT_ENTRY', '%A, %e %B. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index 8b25ad9..d3d0603 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -5,6 +5,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'ISO-8859-1'); +@define('SQL_CHARSET', 'latin1'); @define('DATE_LOCALES', 'sv_SV.ISO8859-1, sv_SV.ISO-8859-1, swedish, sv, sv_SV'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index ae7977b..39a56bd 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'UTF-8'); +@define('SQL_CHARSET', 'utf8'); @define('DATE_LOCALES', 'zh-TW.UTF-8, zh_TW.UTF-8, tw, zh'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index 920e84f..cb98cb3 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -6,6 +6,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'big5'); +@define('SQL_CHARSET', 'big5'); @define('DATE_LOCALES', 'tw, zh, zh-TW, zh_TW'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index e1d6c87..54f5545 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -4,6 +4,7 @@ /* vim: set sts=4 ts=4 expandtab : */ @define('LANG_CHARSET', 'gb2312'); +@define('SQL_CHARSET', 'gb2312'); @define('DATE_LOCALES', 'zh_CN.GB2312, cn, zh, zh_GB, zh_CN'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); diff --git a/templates/default/admin/img/menuheader_background.png b/templates/default/admin/img/menuheader_background.png index 7f769618fe37281c1239372e1011ae28de6f678d..9060c5682d01248213371d72bf179968250e4758 100644 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^xra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%rF*(KhE&{ob8VwwgMxrdpo5m7 z*(Q$cjr!WgM%OP++{vtSSpLoW2WQ=+r%iT zu}WA*(_oQBkx%ot3C?_$Pr$^F&+6N|3LIBeA22WQ%mvv4F FO#rK4N*DkD literal 1135 zcmbtSXHQ!P6g91)kVL3bhLj*7Rc)kJ1yw>SO`Eh5ZA`#QAP_;Y!3MKzM%iXhgMok< z0Yfmw3;|`Y0Abhc(Lh*XuVB2#^L)?G+jW0KKb&)Qk96;m&b`H+9C5Q^neIe5VqviTCBM9vqyzb*wWg*`hJbg;k0*jVR87R*b-_v z8iTE@su>;`-QPdJ2H^83g|92C8I8>unK_e_f48-Fj*U<9c>IeC7QK!U5g82t()ACU zX&G6egz(h#%!sI%dPb8}DqCOQNKMP+^Z5i~WO*g6yrN1V5X8nMD3!{t?%o7a^6uXL z>Dl?*+`{(G$NBlCnc4Z$^4A9khegHI=$N=yC8br>Z-^05%PXs4#E7QmmgbgLKWtz~ z7||E)H#N@yG8hk7yPA)D?+%b;Zuj z(p-yk!z3aQH*Wn0E5x6SyB6^(3FYo`bFgr$XYwfJ*j`rVV z`}q>%&n51UHhg8#-xo7xzD&wWTV7%g-tamZTjIGo^!?;L8oD&uMQhi@(x>bJQq&nM zi}r=bw{#{UWF46TcZZ>bkL*vTp7(m7eNJxjg-7+5>|3@HR{YKy^>HnYOeWv6_V&3q zmwU~+baAn*Ei{xw8X4K$9iNzha7X0Xm!6(mSU$|hFi_e^$@w=GT4cnys&fzBwPNH5fV%fu}{~>+7jX~rvdmO9h SzItG}4g%%kf$aYspZ70Z<+A7i diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css index 017eeda..148c69c 100644 --- a/templates/default/admin/style.css +++ b/templates/default/admin/style.css @@ -1,10 +1,51 @@ + /* ***************************** + MAIN Selectors + * *****************************/ + body { + font-size: 10pt; + margin: 0; + background-color: #FFFFFF; + font-size: 10px; + font-family: luxi sans, trebuchet ms, bitstream vera sans, verdana, arial, helvetica, sans-serif; + direction: ltr; +} + +a, input, textarea, p, td, th, div, span { + font-family: luxi sans, "Trebuchet ms", bitstream vera sans, verdana, arial, helvetica, sans-serif; +} + +h4,h3 { + margin: 0; +} + +a:link, +a:visited, +a:active { + color: #011a7c; + text-decoration: underline; +} + +a:hover { + color: #011a7c; + text-decoration: underline; +} + +td, th { + font-size: 0.8em; +} + +input, select, textarea { + background: #F8F9FA; font-family: Verdana; - margin: 0 0 0 0; - background: #7F9BC2 url({TEMPLATE_PATH}img/background.jpg) repeat-x; - direction: {LANG_DIRECTION}; + font-size: 0.9em; + border: 1px solid #294366; } +/* ***************************** + GENERAL PAGE Selectors + * *****************************/ + #serendipity_admin_page { text-align: center; } @@ -15,29 +56,12 @@ body { #serendipityAdminFrame { text-align: left; - width: 80%; - min-width: 777px; + width: 100%; margin: auto; background: #FFF; - border: 2px solid #0F3353; - border-top: 0; + border: 0px; } -#serendipityAdminBanner { - background-color: #FFF; - height: 80px; - background: url({TEMPLATE_PATH}img/banner_background.png); -} - -#serendipityAdminInfopane { - background: #F8F9FA url({TEMPLATE_PATH}img/infobar_background.png); - font-size: 10px; - padding: 5px; - vertical-align: middle; - text-align: right; - color: #5E5E5E; - height: 27px; -} #serendipityAdminMainpane { background: #FFF; @@ -48,49 +72,131 @@ body { .serendipityAdminContent { font-size: 0.8em; - padding: 10px 5px 20px 5px; + padding: 10px 25px 20px 25px; width: 80%; + z-index: 1; +} + +#serendipityAdminFooter { + font-size: 0.7em; + text-align: center; + color: #FFF; +} + +/* ***************************** + HEADER Selectors + * *****************************/ + +#serendipityAdminBanner { + height: 150px; + background-color: #011b7c; + background-image: url(templates/default/img/header_bar.png); + background-repeat: repeat-x; + width: 100%; + padding: 0px; + margin: 0px; + border: 0px; } #serendipityAdminBanner h1 { - padding-left: 20px; - font-size: 1.8em; - margin: 0; + position: absolute; + top: 0px; + left: 0px; + background-image: url(templates/default/img/header_logo.png); + background-repeat: no-repeat; + padding: 78px 0px 0px 131px; + height: 100px; + width: 770px; + font-size: 2.4em; + letter-spacing: 0.05em; + margin: 0px; + overflow: hidden; + color: #011b7c; + z-index: 0; } #serendipityAdminBanner h2 { - padding-left: 30px; - font-size: 1em; - color: #AAA; - margin: 0; + position: absolute; + top: 108px; + left: 131px; + font-size: 1.3em; + margin: 0px; + letter-spacing: 0.03em; + color: #011b7c; +} + +#serendipityAdminInfopane { + font-size: 10px; + padding: 5px; + vertical-align: middle; + text-align: right; + color: #011b7c; + height: 27px; } + +/* ***************************** + MENU Selectors + * *****************************/ + #serendipitySideBar { - width: 20%; - padding-top: 10px; } -#serendipityAdminFooter { - font-size: 0.7em; - text-align: center; - color: #FFF; +ul.serendipitySideBarMenu { + padding: 0px 0px 2px 0px; + margin: 0px 0px 5px 22px; + display: block; + width: 190px; + list-style: none; } -.serendipitySideBarTitle { - padding-left: 2px; +ul.serendipitySideBarMenu li { + display: block; + list-style: none; + font-size: x-small; +} + +ul.serendipitySideBarMenu { + background-color: #fafaff; +} + +ul.serendipitySideBarMenu li.serendipitySideBarMenuHead { + background-color: #011c7e; + color: #FFFFFF; font-weight: bold; + padding: 5px 0px 0px 5px; + background: url(templates/default/admin/img/menuheader_background.png) repeat-x; + height: 20px; font-size: 0.9em; + border: 0px; + margin: 0px 0px 5px 0px; } -.serendipitySideBarContent { - padding-left: 10px; - font-size: 0.8em; +ul.serendipitySideBarMenu li { + display: block; + border: 0px; + border-left: 1px solid #011c7e; + border-bottom: 1px solid #011c7e; + margin: 0px 5px 5px 5px; + background-color: #ffffff; } -.serendipitySideBarItem { - margin-bottom: 10px; +ul.serendipitySideBarMenu li a { + padding-left: 5px; + text-decoration: none; + display: block; } +ul.serendipitySideBarMenu li a:hover { + background-color: #011c7e; + color: white; +} + + +/* ***************************** + OTHER Selectors + * *****************************/ + .serendipity_admin_title { font-size: 2em; margin-bottom: 5px; @@ -130,69 +236,12 @@ body { margin: 10px; } - - -td, th { - font-size: 0.8em; -} - -a:visited, -a:link { - color: #294366; - text-decoration: underline; -} - -a:hover { - color: #D40041; -} - -input, select, textarea { - background: #F8F9FA; - font-family: Verdana; - font-size: 0.9em; - border: 1px solid #294366; -} - #serendipity_iframe { border: 1px solid #294366; text-align: center; margin: auto; } -ul.serendipitySideBarMenu { - padding: 0; - margin: 0; -} - -ul.serendipitySideBarMenu li.serendipitySideBarMenuHead { - font-size: 0.85em; - list-style: none; - display: block; - font-weight: bold; - background: url({TEMPLATE_PATH}img/menuheader_background.png) no-repeat; - padding-top: 0.3em; - padding-bottom: 0.3em; - padding-left: 3px; -} - -ul.serendipitySideBarMenu li { - font-size: 0.8em; - font-weight: normal; - background:url({TEMPLATE_PATH}img/menu_background.png) no-repeat; - padding-top: 0.3em; - padding-bottom: 0.3em; - padding-left: 5px; - list-style:none; - display:block; - margin:0; -} - -ul.serendipitySideBarMenu a:link, -ul.serendipitySideBarMenu a:visited { - text-decoration: none; - font-weight: bold; -} - .serendipityImageButton { cursor: pointer; } @@ -224,7 +273,6 @@ a:visited.serendipityIconLinkRight { border: 0; } - a:link.serendipityPrettyButton, a:visited.serendipityPrettyButton, a:hover.serendipityPrettyButton { @@ -234,7 +282,7 @@ a:hover.serendipityPrettyButton { .serendipityPrettyButton { padding: 1px; - background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top; + background: url(templates/default/admin/img/button_background.png) repeat-x top; color: #1D2E3F; font-weight: bold; font-size: 0.9em; @@ -242,7 +290,6 @@ a:hover.serendipityPrettyButton { margin: 2px; } -/* Special class if the button is a tag */ a.serendipityPrettyButton { padding: 2px 4px 2px 4px; cursor: default; @@ -293,3 +340,5 @@ table#serendipity_customfields .customfield_value textarea { width: 100%; height: 100px; } + + diff --git a/templates/default/entries.tpl b/templates/default/entries.tpl index 04a1ef5..751fa93 100644 --- a/templates/default/entries.tpl +++ b/templates/default/entries.tpl @@ -3,11 +3,13 @@ {foreach from=$entries item="dategroup"}
+
{if $dategroup.is_sticky}

{$CONST.STICKY_POSTINGS}

{else}

{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}

{/if} +
{foreach from=$dategroup.entries item="entry"}

{$entry.title}

diff --git a/templates/default/img/back.png b/templates/default/img/back.png index 0fc771aa7a920fcab65e6883950b66ed34a8c015..69e26358905f799adb54dcf807dd09a075a6eec5 100644 GIT binary patch delta 610 zcmV-o0-gQT1EB?w7YYyv1^@s6AM^iVks&vK0y9ZOK~#9!V)+06KLb9jYwhK)XXA4K zmpl^#9-wdQQ_U+Vw(S4^fA+Z4U^PI`#+yyw)^~-Jl1_C~O&J#x6EjXrSg>doWn^U9 z1$4S*W`rv{2OBFsN1_@4)U3_O$hg-%I6=hMPLKKi(>Dwn3K9$~Z0tXPa{rOl0@b~L zym)wv1S2RQpqjl{SlL#_r{-{LD@!rnd-9s$-@pG1Mw)UAfB*ht_y<(?`_Es7KR`B! zUshhhaPjbFMiyvbm2&e5HDqRGaq)6-FkHFw6lM#<$;D` z&;Liy-!VLU{ej{0*B=c0yqpXlKYwTV^5qM|x6kjvn1z*{ft`zofrE>e!B|TkVE`}; z!e2kV+qH7(f@~+RU`~+fClBpmU8b&Lh5kXj zi4=%2KwD;7x`l9Yaj-F*J8_8N@1Nfc{(->^Ff}lzgS5a20#rl2L{}B z9V;(BRYh6m<3|rMc(}VWES@{{`@g?`*^r|V=z@2^XcR+9i9i!i0u9u=a%|h3vuDrz zw6k}F1mf>sod5p)k07*qoM6N<$g6Cf)-v9sr delta 403 zcmV;E0c`%E1=ItO7YYmr0ssI2}+gp8L$C>0Ac`YfTMkf4grP!|Nrmm=JxIP@9%&9{QUP1Spg6M1P}wJY9Qd`o;vuP*8aI@S&!bmM{>AhzJM>0QErB0CfWO00a;tJZS)30(8%wUAy+| x-VJoFp1!^aP=lZ#7Z(>q0nlckxc~tM08W-3F^C~Jt^fc407*qoM6N<$f(m6QwsHUf diff --git a/templates/default/img/forward.png b/templates/default/img/forward.png index 5c8fe96bab9ce3523bd74471e2433465399469b0..da5d6880b1afce1af37d9830429230e79d3b776d 100644 GIT binary patch delta 623 zcmV-#0+9XP1Fi*-7YYyv1^@s6AM^iVks&vK0zgSbK~#9!V)+06KLa+bXXCR@*V@Y$ zmplwJG2j6I|NrylmG6m?&%RsgYniSK_sT0{AJb%j|D=x^eZr}Mod)6<1 zdIj{F)1@O@Z=x6gH2HUZV>1gI3o`=?2s1M=Ff%bRaI&*9T)O=fD8|H~C?&#h@z#_7 zi{?!E`uET8K%gOePz-2oZDTog^#NEj2OBE`E6^Yi{s)u?0VbfA6s1KN-hBANFk|}E z@87?CEW3Dk%M^GRfRz3G^#_c<|NISq#@~MYV)*s@4;X{^m+w3UTToP3$SESF)CKhV zL>8C*sfd53ipwJOg^;-@m^Ma_UBZ3<}bs z49k}-`S$7Uixoicr?Vi3yPKCkF!~@-2=X(C-mz^nSWd^p1{@|^*Dm??>&Mq}kpDsA zEYLWAziP=m9$09A0v0ItFDxdRn}wB~!NkIb;l5H1>FOX7YYmr0ssI2^rKmg&?z{$z^9}Iwcw(QvP`Nt24 z9)JJ>Y1nt@5YRkMQ~*@>9|nNz^_w<9^Z*191Kf7}0ImlhfEXaQ|Ni|OzlMMR{#jXn zTR(mE3Lt=3AYT9c`7;|E8#6OAa(FO-0nn@;KYjqopFe-Tee(t&fIu36VfX#}cOajU zkr7z~3mE+R^$Vy$PEM}2q2c4lj{pG#(oj)d9Ty*e^vDrp7Xyua{P;1@2%uwts`CpA zH8eDU;s61}2#GkL8Sme}fBx(lko@s~{X0-3JS61KojX9)3JMBEB_+Cgdg2liGBPp% z0mK5gori}$jQqCxdH+LV&dX_e0%@_1^`ngKDPWi-Rb}U002n{MNUMn HLSTXll#sY~ diff --git a/templates/default/img/xml.gif b/templates/default/img/xml.gif index 3cefc36136892e2acb8fbd9e8defc7ccd47ddf51..776e54d91171116c598e32484eb2cbd5ab6abd8c 100644 GIT binary patch literal 597 zcmV-b0;>H-Nk%w1VGaNe0OoxF*-QZRi6Yla0P}<)@`NJba3m zNan43>W3ZVqjlw_cJa%i)Jg!~c^CGOG5ef3@}pAnhZ*C5AMKD#;b;o#^{G1*|j56r7jOl$U;i7Ntn_S_TNBf&N_0hBY^Xl1I zBH(f+<)nV`iXr;Yq~eT2+Ibi9*T3hjbKid+M;Dt8uiXh&6KjCm8(_kR@$eZbRBKe&<;h%5WS|aSelXS+P zo;vZ#q2rKK_}RMTnM(GSHrrYs@{J(vtcvA$De8hD?Z1@neInL=N$Qg|+;S-2fFI{^ zBJO@7>XcsOfg1PR!sduG-fJb=OaR+W0NhOg|NsC0|Nj6000000A^8LW004aeEC2ui z01f~S000NFfPH!Z0C{?Qh>3fGGgv?w8dEnRFA^I{dwC{qe4Tte3T8WDE_-@-Ck+lZ zMV%{KP!pyFaAQb!GDaPIDoz}xKL(w4G;cZ|d{Qi?YC~QnolGN9d|3mCUo{{JWg>hO zacq2ZnI26QPYf}9WGxGP7kdH`VtfZ^M+kgWIDB+_5Qy~X1j7OfJ}J2HNh7b$13p3m jtO1kbiWL%FG9{@JBmjXnTI66@;^WLBMJN;X2?PK;$AThC literal 111 zcmZ?wbhEHblx5&$n8?78mX`J(2+|mUK=CIFh+@zI5g>U6Ci|BDmDvyZ7f;d(z#WgI)6`DJiqjEe|E2zg+i9vp2le_ {if $leftSidebarElements > 0} - {serendipity_printSidebar side="left"} +
{serendipity_printSidebar side="left"}
{/if} - {$CONTENT} +
{$CONTENT}
{if $rightSidebarElements > 0} - {serendipity_printSidebar side="right"} +
{serendipity_printSidebar side="right"}
{/if} @@ -48,6 +48,9 @@ {$raw_data} {serendipity_hookPlugin hook="frontend_footer"} + + + {if $is_embedded != true} diff --git a/templates/default/plugin_calendar.tpl b/templates/default/plugin_calendar.tpl index 6d129ec..f74efc8 100644 --- a/templates/default/plugin_calendar.tpl +++ b/templates/default/plugin_calendar.tpl @@ -2,7 +2,7 @@ {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date} - {$CONST.BACK} + {$CONST.BACK} {/if} @@ -12,7 +12,7 @@ {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date} - {$CONST.FORWARD} + {$CONST.FORWARD} {/if} @@ -26,7 +26,7 @@ {foreach from=$plugin_calendar_weeks item="week"} {foreach from=$week.days item="day"} - {if isset($day.properties.Active) and $day.properties.Active}{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}{/if} + {if isset($day.properties.Active) and $day.properties.Active}{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}{/if} {/foreach} {/foreach} diff --git a/templates/default/style.css b/templates/default/style.css index faab58d..083cb68 100644 --- a/templates/default/style.css +++ b/templates/default/style.css @@ -1,158 +1,185 @@ -h4,h3 { - margin: 0; -} +/* Edited with EditCSS */ +/**** LINK-tag style sheet serendipity.css ****/ -.serendipitySideBarContent input { - width: 150px; -} +/* ***************************** + MAIN Selectors + * *****************************/ -#mainpane { - border-bottom: 1px solid #000000; - margin: auto; - width: 100%; - border-top: 0px; +body { + font-size: 10pt; + margin: 0px; + padding: 0px; background-color: #FFFFFF; - border-top: 1px solid #000000; + font-size: 10px; + font-family: luxi sans, trebuchet ms, bitstream vera sans, verdana, arial, helvetica, sans-serif; } -#content { - padding: 10px; - margin: 10px; - width: auto; +a, input, textarea, p, td, th, div, span { + font-family: luxi sans, "Trebuchet ms", bitstream vera sans, verdana, arial, helvetica, sans-serif; } -#serendipityRightSideBar { - width: 170px; - border-left: 1px dashed #000000; - padding: 10px; - vertical-align: top; +h4,h3 { + margin: 0; } -#serendipityLeftSideBar { - width: 170px; - border-right: 1px dashed #000000; - padding: 10px; - vertical-align: top; +a:link, +a:visited, +a:active { + color: #011a7c; + text-decoration: none; } -body { - font-size: 10pt; - margin: 0; - background-color: #D2DFF2; - font-size: 10px; - font-family: verdana, arial, helvetica, sans-serif; - margin-bottom: 30px; +a:hover { + color: #011a7c; + text-decoration: underline; } -input, textarea { - font-size: 10pt; - font-family: verdana, arial, helvetica, sans-serif; +#mainpane { + border: 0px; + padding: 0px; + margin: 20px 0px 0px 0px; + width: 100%; + position: relative; } -th, td { - font-size: 10pt; +/* ***************************** + HEADER + * *****************************/ + +#serendipity_banner { + height: 150px; + background-color: #011b7c; + background-image: url(templates/default/img/header_bar.png); + background-repeat: repeat-x; + width: 100%; + padding: 0px; + margin: 0px; + border: 0px; } -p, td, th, div, span { - font-family: verdana, arial, helvetica, sans-serif; +#serendipity_banner h1 { + position: absolute; + top: 0px; + left: 0px; + background-image: url(templates/default/img/header_logo.png); + background-repeat: no-repeat; + padding: 78px 0px 0px 131px; + height: 100px; + width: 770px; + font-size: 2.4em; + letter-spacing: 0.05em; + margin: 0px; + overflow: hidden; } -#serendipity_banner { - margin: auto; - width: 100%; - height: 72px; - background-image: url({TEMPLATE_PATH}img/background.png); +#serendipity_banner h2 { + position: absolute; + top: 108px; + left: 131px; + font-size: 1.3em; + margin: 0px; + letter-spacing: 0.03em; } a.homelink1, -a.homelink1:hover, a.homelink1:link, -a.homelink1:visited, -#serendipity_banner h1 { - color: #FFFFFF; - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : 20px; - padding-left:15px; - padding-top: 10px; - margin: 0px; +a.homelink1:visited { + color: #011c7e; text-decoration: none; } a.homelink2, -a.homelink2:hover, a.homelink2:link, -a.homelink2:visited, -#serendipity_banner h2 { - color: #FFFFFF; - padding-left: 15px; - font-size: 14px; - margin: 0px; +a.homelink2:visited { + color: #011c7e; text-decoration: none; } -.serendipity_title { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size: medium; - font-weight: bold; - margin-top: 10px; - color: #333333; - padding-left: 5px; - border-bottom: 2px solid #36558C; +a.homelink1:hover, +a.homelink2:hover { + color: #8eb2d9; + border-bottom: 1px solid #8eb2d9; } -.serendipity_title a:link, -.serendipity_title a:visited { - text-decoration: none; - border: 0; - color: #000000; +/* ***************************** + Content Parts + * *****************************/ + +#content { + padding: 0px 0px 0px 22px; + margin: 10px auto 0px auto; + vertical-align: top; } -.serendipity_title a:hover { - color: #FF0000; +#contentSpacer { + min-width: 400px; + margin: 0px auto 0px auto; } -.serendipity_entry { - font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; - color: #333333; - font-size: 9.5pt; - font-weight: normal; - padding-right: 10px; - width: 95%; - margin: auto; - margin-top: 10px; +.serendipity_content_message { } -.serendipity_entry_body_folded, -.serendipity_entry_body_unfolded, -.serendipity_entry_extended { - /* Inner blocks of .serendipity_entry, can be used for further customization */ +/* ***************************** + Entry related + * *****************************/ + +.serendipity_Entry_Date { + background-color: #FDFDFF; + margin-bottom: 40px; } -.serendipity_entry_date { - margin: auto; +.serendipity_Entry_Header { + background-color: #FFFFFF; + border-bottom: 1px solid #011a7c; } .serendipity_date { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size: large; - color: #333333; - margin: 0; - margin-top: 20px; - text-align: right; + display: inline; + background-color: #011a7c; + color: white; + font-size: 1.1em; + margin: 0px; + padding: 0px 5px 0px 5px; } -.serendipity_commentsTitle { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size: small; +.serendipity_title { + margin: 0px; + background-color: #FFFFFF; + font-size: 2em; font-weight: bold; - margin-top: 10px; - color: #333333; - padding-left: 5px; - border-bottom: 2px solid #36558C; + color: #011a7e; + padding: 10px 0px 10px 4px; + border-bottom: 1px solid #b8d3f0; +} + +.serendipity_title a, +.serendipity_title a:link, +.serendipity_title a:visited { + color: #011a7c; + text-decoration: none; +} + +.serendipity_title a:hover { + color: #8eb2d9; + border-bottom: 1px solid #8eb2d9; +} + +.serendipity_entry { + color: #000000; + font-size: 1.3em; + font-weight: normal; + padding: 5px; + margin: auto; + margin-top: 5px; + background-color: #FDFDFF; +} + +.serendipity_entry .serendipity_entryFooter { + padding: 5px; + margin: 15px 5px 5px 5px; } div.serendipity_entryFooter { - font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; font-size: x-small; color: #000000; padding-top: 10px; @@ -165,11 +192,99 @@ img.serendipity_entryIcon { border: 0px; } -img.serendipity_entryIcon { - float: right; +/* ***************************** + SIDEBARS + * *****************************/ + +.serendipitySideBarContent input { + width: 150px; +} + +#serendipityRightSideBar { + width: 190px; +} + +#serendipityLeftSideBar { + width: 190px; +} + +.sideBarSpacer { + margin: 0px 30px 0px 30px; +} + +div.serendipityPlug { + padding-left: 10px; +} + +div.serendipityPlug a { + text-decoration: none; border: 0px; } +/* Container for each item on the side bar */ +div.serendipitySideBarItem { + padding-bottom: 12px; + margin-bottom: 12px; + font-size: 12px; + font-weight:normal; + border: 0px; + width: 180px; +} + +.serendipitySideBarContent { + background-color: #FFFFFF; + background-image: url(templates/default/img/sidebar_spacer.jpg); + background-repeat: repeat-x; + background-position: 0px 0px; + padding: 5px; + padding-top: 10px; +} + +.serendipitySideBarContent form { + margin: 0px; + padding: 0px; +} + +#serendipityLeftSideBar .serendipitySideBarTitle { + background-image: url(templates/default/img/sidebar_left.jpg); + background-repeat: no-repeat; + border: 1px solid #011a7c; +} + +#serendipityRightSideBar .serendipitySideBarTitle { + background-image: url(templates/default/img/sidebar_left.jpg); + background-repeat: no-repeat; + border: 1px solid #011a7c; +} + +/* title of an individual item */ +.serendipitySideBarTitle { + background-color: #1f3180; + margin: 0px; + color: #FFFFFF; + font-size: 12px; + font-weight:bold; + padding: 4px 5px 2px 5px; + display: block; +} + +/* ***************************** + COMMENTS + * *****************************/ + +.serendipity_comments { + position: relative; +} + +.serendipity_commentsTitle { + font-size: small; + font-weight: bold; + margin-top: 10px; + color: #011a7c; + padding-left: 5px; + border-bottom: 1px solid #b8d3f0; +} + td.serendipity_commentsLabel { font-size: 12px; font-weight: bold; @@ -181,54 +296,52 @@ td.serendipity_commentsValue select, td.serendipity_commentsValue textarea { font-size: 12px; padding: 2px; - width: 400px; + width: 380px; } - .serendipity_commentForm { font-size: 13px; - color: #404040; margin-bottom: 13px; margin-right: 10px; margin-left: 10px; background-color: #FFFFFF; } + .serendipity_comment { font-size: 13px; - margin-top: 10px; + margin-top: 14px; margin-right: 10px; margin-left: 10px; - color: #404040; - padding: 3px; + margin-bottom: 35px; + border: 1px solid #b8d3f0; background-color: #FFFFFF; + padding: 5px 5px 5px 5px; + clear: both; +} + +.serendipity_commentBody { + padding: 0px 0px 0px 5px; overflow: auto; } .serendipity_comment_source { - margin-top: 5px; - padding-left: 5px; - margin-bottom: 5px; - padding-bottom: 3px; - border-bottom: 2px solid #36558C; + margin-top: 10px; + padding: 0px 0px 0px 5px; + color: #011a7c; + display: block; + position: absolute; + z-index: 3; } -a:link, -a:visited, -a:active { - color: #003366; - text-decoration: underline; -} -a:hover { - color: #000000; - text-decoration: underline; -} +/* ***************************** + CALENDAR + * *****************************/ table.serendipity_calendar td { font-size:11px; padding: 3px; } table.serendipity_calendar a { - color: #FF0000; font-weight: bold; text-decoration:none; } @@ -248,44 +361,14 @@ td.serendipity_calendarHeader a:hover { text-decoration: none; } -div.serendipityPlug { - padding-left: 10px; -} - -div.serendipityPlug a { - text-decoration: none; - border: 0px; -} - -/* Container for each item on the side bar */ -div.serendipitySideBarItem { - padding-bottom: 12px; - margin-bottom: 12px; - font-size: 12px; - font-weight:normal; - border-bottom: solid 2px #36558C; -} - -/* title of an individual item */ -.serendipitySideBarTitle { - margin: 0; - font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; - color: #000000; - font-size: 12px; - font-weight:bold; - padding-left:2px; - padding-bottom:2px; -} +/* ***************************** + IMAGE comments + * *****************************/ .serendipityImageButton { cursor: pointer; } -.serendipity_entry p { - margin: 0px; - padding-bottom: 0px; -} -/** Embedded images with the s9y image manager **/ .serendipity_imageComment_center, .serendipity_imageComment_left, .serendipity_imageComment_right { @@ -324,9 +407,6 @@ div.serendipitySideBarItem { text-align: center; } -.serendipity_comments { -} - .serendipity_center { margin-left: auto; margin-right: auto; @@ -341,9 +421,9 @@ div.serendipitySideBarItem { color: green; } -.serendipity_entry_author_self { +#copyright { + margin: 0px auto 0px auto; + text-align: center; } -.serendipity_comment_author_self .serendipity_comment_source { - background-color: #EEEEFF; -} + -- 2.39.5