You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(30) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18358/lang Modified Files: serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php serendipity_lang_tn.inc.php serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php Log Message: * Remove Quicksave functionality, this is no longer needed because of iframes * Add event hook to support new plugin controlling trackbacks Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- serendipity_lang_cs.inc.php 15 Dec 2004 19:46:36 -0000 1.83 +++ serendipity_lang_cs.inc.php 16 Dec 2004 15:03:31 -0000 1.84 @@ -581,7 +581,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -659,4 +658,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- serendipity_lang_no.inc.php 15 Dec 2004 19:46:39 -0000 1.24 +++ serendipity_lang_no.inc.php 16 Dec 2004 15:03:33 -0000 1.25 @@ -576,7 +576,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -653,4 +652,4 @@ @define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate @define('NO_CATEGORIES', 'No categories'); // Translate -?> \ No newline at end of file +?> Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- serendipity_lang_nl.inc.php 15 Dec 2004 19:46:38 -0000 1.59 +++ serendipity_lang_nl.inc.php 16 Dec 2004 15:03:33 -0000 1.60 @@ -586,7 +586,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -664,4 +663,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- serendipity_lang_en.inc.php 15 Dec 2004 19:46:37 -0000 1.103 +++ serendipity_lang_en.inc.php 16 Dec 2004 15:03:32 -0000 1.104 @@ -579,7 +579,6 @@ @define('INSTALL', 'Install'); @define('ALREADY_INSTALLED', 'Already installed'); @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); -@define('QUICKSAVE', 'Quicksave'); @define('INSTALL_OFFSET', 'Server time Offset'); @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); @define('STICKY_POSTINGS', 'Sticky Postings'); @@ -655,4 +654,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_tw.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- serendipity_lang_tw.inc.php 15 Dec 2004 19:46:40 -0000 1.19 +++ serendipity_lang_tw.inc.php 16 Dec 2004 15:03:34 -0000 1.20 @@ -578,7 +578,6 @@ @define('INSTALL', '¦w¸Ë'); @define('ALREADY_INSTALLED', '¤w¸g¦w¸Ë'); @define('SELECT_A_PLUGIN_TO_ADD', '½Ð¿ï¾Ün¦w¸Ëªº¥~±¾'); -@define('QUICKSAVE', '§Ö³tÀx¦s'); @define('RSS_IMPORT_DESC', 'RSS ªº¿é¤J¥\¯à¥i¥HÅý±zÂ^¨ú RSS feed ©M¿é¤J©Ò¦³ªº¤å³¹. ±z¥i¥H¿ï¾Ü¥Î¯ó½Z©Î¤½¶}ªº¤è¦¡¿é¤J. ¥~¨Ó feed ªºÃþ§O¦WºÙ¥²¶·¸ò±zªº Serendipity Ãþ§O¦WºÙ¬Û¦P. ¦pªGÃþ§O¦WºÙ¤£¬Û¦P, ±z¥i¥H¥Î¨ä¥LÄæ¦ì¿ï¾Ü±zn³sµ²¤å³¹ªºÃþ§O.'); @define('RSS_IMPORT_CATEGORY', '¥Î³oÓÃþ§Oµ¹¤£¬Û¦Pªº¿é¤J¤å³¹'); @@ -657,4 +656,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- serendipity_lang_bg.inc.php 15 Dec 2004 19:46:36 -0000 1.37 +++ serendipity_lang_bg.inc.php 16 Dec 2004 15:03:31 -0000 1.38 @@ -563,7 +563,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -641,4 +640,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- serendipity_lang_pt.inc.php 15 Dec 2004 19:46:40 -0000 1.59 +++ serendipity_lang_pt.inc.php 16 Dec 2004 15:03:34 -0000 1.60 @@ -582,7 +582,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -660,4 +659,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- serendipity_lang_it.inc.php 15 Dec 2004 19:46:38 -0000 1.23 +++ serendipity_lang_it.inc.php 16 Dec 2004 15:03:33 -0000 1.24 @@ -581,7 +581,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -659,4 +658,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- serendipity_lang_da.inc.php 15 Dec 2004 19:46:37 -0000 1.103 +++ serendipity_lang_da.inc.php 16 Dec 2004 15:03:31 -0000 1.104 @@ -576,7 +576,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -654,4 +653,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- serendipity_lang_fr.inc.php 15 Dec 2004 19:46:38 -0000 1.82 +++ serendipity_lang_fr.inc.php 16 Dec 2004 15:03:32 -0000 1.83 @@ -584,7 +584,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -662,4 +661,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- serendipity_lang_cz.inc.php 15 Dec 2004 19:46:37 -0000 1.83 +++ serendipity_lang_cz.inc.php 16 Dec 2004 15:03:31 -0000 1.84 @@ -579,7 +579,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -657,4 +656,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- serendipity_lang_es.inc.php 15 Dec 2004 19:46:38 -0000 1.99 +++ serendipity_lang_es.inc.php 16 Dec 2004 15:03:32 -0000 1.100 @@ -587,7 +587,6 @@ @define('INSTALL', 'Install'); // Translate @define('ALREADY_INSTALLED', 'Already installed'); // Translate @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate -@define('QUICKSAVE', 'Quicksave'); // Translate @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @@ -663,4 +662,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_cn.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- serendipity_lang_cn.inc.php 15 Dec 2004 19:46:36 -0000 1.4 +++ serendipity_lang_cn.inc.php 16 Dec 2004 15:03:31 -0000 1.5 @@ -578,7 +578,6 @@ @define('INSTALL', 'å®è£ '); @define('ALREADY_INSTALLED', 'å·²ç»å®è£ '); @define('SELECT_A_PLUGIN_TO_ADD', '请éæ©è¦å®è£ çå¤æ'); -@define('QUICKSAVE', 'å¿«éå¨å'); @define('RSS_IMPORT_DESC', 'RSS çè¾å ¥åè½å¯ä»¥è®©æ¨æ·å RSS feed åè¾å ¥ææçæç« . æ¨å¯ä»¥éæ©ç¨è稿æå ¬å¼çæ¹å¼è¾å ¥. å¤æ¥ feed çç±»å«åç§°å¿ é¡»è·æ¨ç Serendipity ç±»å«å称ç¸å. å¦æç±»å«å称ä¸ç¸å, æ¨å¯ä»¥ç¨å ¶ä»æ ä½éæ©æ¨è¦è¿ç»æç« çç±»å«.'); @define('RSS_IMPORT_CATEGORY', 'ç¨è¿ä¸ªç±»å«ç»ä¸ç¸åçè¾å ¥æç« '); @@ -657,4 +656,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_tn.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- serendipity_lang_tn.inc.php 15 Dec 2004 19:46:40 -0000 1.4 +++ serendipity_lang_tn.inc.php 16 Dec 2004 15:03:34 -0000 1.5 @@ -578,7 +578,6 @@ @define('INSTALL', 'å®è£'); @define('ALREADY_INSTALLED', 'å·²ç¶å®è£'); @define('SELECT_A_PLUGIN_TO_ADD', 'è«é¸æè¦å®è£çå¤æ'); -@define('QUICKSAVE', 'å¿«éå²å'); @define('RSS_IMPORT_DESC', 'RSS çè¼¸å ¥åè½å¯ä»¥è®æ¨æ·å RSS feed åè¼¸å ¥ææçæç« . æ¨å¯ä»¥é¸æç¨è稿æå ¬éçæ¹å¼è¼¸å ¥. å¤ä¾ feed çé¡å¥åç¨±å¿ é è·æ¨ç Serendipity é¡å¥å稱ç¸å. å¦æé¡å¥å稱ä¸ç¸å, æ¨å¯ä»¥ç¨å ¶ä»æ¬ä½é¸ææ¨è¦é£çµæç« çé¡å¥.'); @define('RSS_IMPORT_CATEGORY', 'ç¨éåé¡å¥çµ¦ä¸ç¸åçè¼¸å ¥æç« '); @@ -657,4 +656,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- serendipity_lang_de.inc.php 15 Dec 2004 19:46:37 -0000 1.124 +++ serendipity_lang_de.inc.php 16 Dec 2004 15:03:31 -0000 1.125 @@ -580,7 +580,6 @@ @define('INSTALL', 'Installieren'); @define('ALREADY_INSTALLED', 'Bereits installiert'); @define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen'); -@define('QUICKSAVE', 'Zwischenspeichern'); @define('INSTALL_OFFSET', 'Server Zeitunterschied'); @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone'); @define('STICKY_POSTINGS', 'Dauerhafte Einträge'); @@ -656,4 +655,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_zh.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- serendipity_lang_zh.inc.php 15 Dec 2004 19:46:40 -0000 1.4 +++ serendipity_lang_zh.inc.php 16 Dec 2004 15:03:34 -0000 1.5 @@ -578,7 +578,6 @@ @define('INSTALL', '°²×°'); @define('ALREADY_INSTALLED', 'ÒѾ°²×°'); @define('SELECT_A_PLUGIN_TO_ADD', 'ÇëÑ¡ÔñÒª°²×°µÄÍâ¹Ò'); -@define('QUICKSAVE', '¿ìËÙ´¢´æ'); @define('RSS_IMPORT_DESC', 'RSS µÄÊäÈ빦ÄÜ¿ÉÒÔÈÃÄúߢȡ RSS feed ºÍÊäÈëËùÓеÄÎÄÕÂ. Äú¿ÉÒÔÑ¡ÔñÓòݸå»ò¹«¿ªµÄ·½Ê½ÊäÈë. ÍâÀ´ feed µÄÀà±ðÃû³Æ±ØÐë¸úÄúµÄ Serendipity Àà±ðÃû³ÆÏàͬ. Èç¹ûÀà±ðÃû³Æ²»Ïàͬ, Äú¿ÉÒÔÓÃÆäËûÀ¸Î»Ñ¡ÔñÄúÒªÁ¬½áÎÄÕµÄÀà±ð.'); @define('RSS_IMPORT_CATEGORY', 'ÓÃÕâ¸öÀà±ð¸ø²»ÏàͬµÄÊäÈëÎÄÕÂ'); @@ -657,4 +656,4 @@ @define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Garvin H. <gar...@us...> - 2004-12-16 11:59:31
|
Update of /cvsroot/php-blog/serendipity/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12369 Modified Files: db_update_0.8-alpha5_0.8-alpha6_sqlite.sql Log Message: fix cr/lf and errors reported by Riscky. Thanks! Index: db_update_0.8-alpha5_0.8-alpha6_sqlite.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.8-alpha5_0.8-alpha6_sqlite.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db_update_0.8-alpha5_0.8-alpha6_sqlite.sql 6 Dec 2004 10:47:02 -0000 1.1 +++ db_update_0.8-alpha5_0.8-alpha6_sqlite.sql 16 Dec 2004 11:59:22 -0000 1.2 @@ -1,22 +1,22 @@ -create table {PREFIX}tempplugins ( - name varchar(128) not null, - placement varchar(6) not null default 'right', - sort_order int(4) not null default '0', - authorid int(11) default '0', - PRIMARY KEY(name) -); - -INSERT INTO {PREFIX}tempplugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}plugins; -DROP TABLE plugins; - -create table {PREFIX}plugins ( - name varchar(128) not null, - placement varchar(6) not null default 'right', - sort_order int(4) not null default '0', - authorid int(11) default '0', - path varchar(255) default null, - PRIMARY KEY(name) -); - -INSERT INTO {PREFIX}plugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}plugins; -DROP TABLE tempplugins; +create table {PREFIX}tempplugins ( + name varchar(128) not null, + placement varchar(6) not null default 'right', + sort_order int(4) not null default '0', + authorid int(11) default '0', + PRIMARY KEY(name) +); + +INSERT INTO {PREFIX}tempplugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}plugins; +DROP TABLE {PREFIX}plugins; + +create table {PREFIX}plugins ( + name varchar(128) not null, + placement varchar(6) not null default 'right', + sort_order int(4) not null default '0', + authorid int(11) default '0', + path varchar(255) default null, + PRIMARY KEY(name) +); + +INSERT INTO {PREFIX}plugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}tempplugins; +DROP TABLE {PREFIX}tempplugins; |
|
From: Garvin H. <gar...@us...> - 2004-12-16 11:57:57
|
Update of /cvsroot/php-blog/serendipity/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12103 Modified Files: db_update_0.8-alpha4_0.8-alpha5_sqlite.sql Log Message: borked syntax Index: db_update_0.8-alpha4_0.8-alpha5_sqlite.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.8-alpha4_0.8-alpha5_sqlite.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db_update_0.8-alpha4_0.8-alpha5_sqlite.sql 3 Dec 2004 10:07:44 -0000 1.1 +++ db_update_0.8-alpha4_0.8-alpha5_sqlite.sql 16 Dec 2004 11:57:45 -0000 1.2 @@ -15,7 +15,7 @@ ); INSERT INTO {PREFIX}tempcomments (id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status) SELECT id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status FROM {PREFIX}comments; -DROP TABLE comments; +DROP TABLE {PREFIX}comments; create table {PREFIX}comments ( id {AUTOINCREMENT} {PRIMARY}, @@ -34,5 +34,5 @@ referer varchar(200) default null ); -INSERT INTO {PREFIX}comments (id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status) SELECT id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status FROM {PREFIX}comments; -DROP TABLE tempcomments; +INSERT INTO {PREFIX}comments (id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status) SELECT id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status FROM {PREFIX}tempcomments; +DROP TABLE {PREFIX}tempcomments; |
|
From: Tom S. <tom...@us...> - 2004-12-15 20:02:58
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17313 Modified Files: functions_entries.inc.php Log Message: - Don't show category descriptions in dropdown, takes up too much space Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- functions_entries.inc.php 13 Dec 2004 15:25:39 -0000 1.24 +++ functions_entries.inc.php 15 Dec 2004 20:02:45 -0000 1.25 @@ -1119,7 +1119,7 @@ } if (is_array($cats = serendipity_fetchCategories())) { - $cat_list .= serendipity_generateCategoryList($cats, ($selected == array() ? array(0) : $selected), 1); + $cat_list .= serendipity_generateCategoryList($cats, ($selected == array() ? array(0) : $selected), 2); } $cat_list .= '</select>' . $n; |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:58:15
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15985/admin Modified Files: images.inc.php Log Message: - FIX: Rotation was reversed? Index: images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- images.inc.php 10 Dec 2004 20:59:26 -0000 1.8 +++ images.inc.php 15 Dec 2004 19:58:05 -0000 1.9 @@ -355,7 +355,7 @@ <?php break; - case 'rotateLeft': + case 'rotateCW': if ( serendipity_rotateImg($serendipity['GET']['fid'], -90) ) { ?> <script language="javascript" type="text/javascript"> @@ -366,7 +366,7 @@ } break; - case 'rotateRight': + case 'rotateCCW': if ( serendipity_rotateImg($serendipity['GET']['fid'], 90) ) { ?> <script language="javascript" type="text/javascript"> |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:58:13
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15985 Modified Files: functions_images.inc.php Log Message: - FIX: Rotation was reversed? Index: functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- functions_images.inc.php 15 Dec 2004 19:46:35 -0000 1.18 +++ functions_images.inc.php 15 Dec 2004 19:58:04 -0000 1.19 @@ -913,8 +913,8 @@ <img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png') ?>" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /><br /> <img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /><br /> <?php if ($is_image) { ?><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/resize.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /><br /><?php } ?> - <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateLeft&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_ccw.png') ?>" border="0" /><br /><?php } ?> - <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateRight&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_cw.png') ?>" border="0" /><br /><?php } ?> + <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCCW&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_ccw.png') ?>" border="0" /><br /><?php } ?> + <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCW&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_cw.png') ?>" border="0" /><br /><?php } ?> <a href="?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/delete_image.png') ?>" border="0" /><br /> <?php } |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:50:53
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14325 Modified Files: category.inc.php Log Message: - Forgot to close td tags correctly Index: category.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- category.inc.php 15 Dec 2004 19:46:35 -0000 1.3 +++ category.inc.php 15 Dec 2004 19:50:28 -0000 1.4 @@ -122,18 +122,18 @@ <form method="POST" name="serendipityCategory"> <table cellpadding="5" width="100%"> <tr> - <td><?php echo NAME; ?></th> + <td><?php echo NAME; ?></td> <td><input type="text" name="serendipity[cat][name]" value="<?php echo isset($this_cat['category_name']) ? htmlspecialchars($this_cat['category_name']) : ''; ?>" /></td> <td rowspan="5" align="center" valign="middle" width="200" style="border: 1px solid #ccc"><img src="<?php echo isset($this_cat['category_icon']) ? $this_cat['category_icon'] : '' ?>" id="imagepreview" <?php echo empty($this_cat['category_icon']) ? 'style="display: none' : '' ?>"></td> </tr> <tr> - <td><?php echo DESCRIPTION; ?></th> + <td><?php echo DESCRIPTION; ?></td> <td><input type="text" name="serendipity[cat][description]" value="<?php echo isset($this_cat['category_description']) ? htmlspecialchars($this_cat['category_description']) : ''; ?>" /></td> </tr> <tr> - <td><?php echo IMAGE; ?></th> + <td><?php echo IMAGE; ?></td> <td> <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script> <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';" /> @@ -142,11 +142,11 @@ </tr> <tr> - <td><label for="all_authors"><?php echo ALL_AUTHORS; ?></label></th> + <td><label for="all_authors"><?php echo ALL_AUTHORS; ?></label></td> <td><input id="all_authors" type="checkbox" name="serendipity[cat][all_authors]" value="true" <?php echo (isset($this_cat['authorid']) && $this_cat['authorid'] == '0') ? 'checked="checked"' : ''; ?> /></td> </tr> <tr> - <td><label for="parent_cat"><?php echo PARENT_CATEGORY; ?></label></th> + <td><label for="parent_cat"><?php echo PARENT_CATEGORY; ?></label></td> <td> <select id="parent_cat" name="serendipity[cat][parent_cat]"> <option value="0"<?php if ( (int)$serendipity['GET']['cid'] == 0 ) echo ' selected="selected"'; ?>>[ <?php echo NO_CATEGORY; ?> ]</option> |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:47:25
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13006/include Modified Files: functions.inc.php functions_images.inc.php Log Message: - Redesign and partly rewrite category management TODO: needs the even/uneven css class, somehow Index: functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- functions_images.inc.php 10 Dec 2004 18:53:55 -0000 1.17 +++ functions_images.inc.php 15 Dec 2004 19:46:35 -0000 1.18 @@ -915,7 +915,7 @@ <?php if ($is_image) { ?><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/resize.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /><br /><?php } ?> <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateLeft&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_ccw.png') ?>" border="0" /><br /><?php } ?> <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateRight&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_cw.png') ?>" border="0" /><br /><?php } ?> - <a href="?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" /><br /> + <a href="?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/delete_image.png') ?>" border="0" /><br /> <?php } ?> Index: functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- functions.inc.php 8 Dec 2004 20:27:52 -0000 1.11 +++ functions.inc.php 15 Dec 2004 19:46:34 -0000 1.12 @@ -102,6 +102,40 @@ return $data; } +function serendipity_walkRecursive($ary, $child_name = 'id', $parent_name = 'parent_id', $parentid = 0, $depth = 0) { + global $serendipity; + static $_resArray; + + if ( sizeof($ary) == 0 ) { + return array(); + } + + if ($parentid === VIEWMODE_THREADED) { + $parentid = 0; + } + + if ( $depth == 0 ) { + $_resArray = array(); + } + + foreach ($ary as $data) { + if ($parentid === VIEWMODE_LINEAR || !isset($data[$parent_name]) || $data[$parent_name] == $parentid) { + $data['depth'] = $depth; + $_resArray[] = $data; + if ($data[$child_name] && $parentid !== VIEWMODE_LINEAR ) { + serendipity_walkRecursive($ary, $child_name, $parent_name, $data[$child_name], ($depth+1)); + } + } + } + + /* We are inside a recusive child, and we need to break out */ + if ($depth !== 0) { + return true; + } + + return $_resArray; +} + function serendipity_fetchUsers($user = '') { global $serendipity; |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:47:23
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13006/include/admin Modified Files: category.inc.php Log Message: - Redesign and partly rewrite category management TODO: needs the even/uneven css class, somehow Index: category.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- category.inc.php 19 Nov 2004 11:05:32 -0000 1.2 +++ category.inc.php 15 Dec 2004 19:46:35 -0000 1.3 @@ -4,11 +4,9 @@ die ("Don't hack!"); } -$cat_to_edit = (isset($_GET['serendipity']['cat']['catid']) ? (int)$_GET['serendipity']['cat']['catid'] : 0); -$msg = ''; - $admin_category = ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF ? "AND (authorid = 0 OR authorid = {$serendipity['authorid']})" : ''); +/* Add a new category */ if (isset($_POST['SAVE'])) { $name = addslashes($_POST['serendipity']['cat']['name']); $desc = addslashes($_POST['serendipity']['cat']['description']); @@ -16,7 +14,7 @@ $icon = addslashes($_POST['serendipity']['cat']['icon']); $parentid = (isset($_POST['serendipity']['cat']['parent_cat']) && is_numeric($_POST['serendipity']['cat']['parent_cat'])) ? $_POST['serendipity']['cat']['parent_cat'] : 0; - if ($cat_to_edit == 0) { + if ($serendipity['GET']['adminAction'] == 'new') { if ($parentid != 0) { // TODO: This doesn't seem to work as expected, serendipity_rebuildCategoryTree(); is still needed! Only activate this optimization function when it's really working :) // TODO: This works if only one subcategory exists. Otherwise, the first query will return an array. @@ -26,11 +24,15 @@ */ } $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon, parentid, category_left, category_right) values ('$name', '$desc', $authorid, '$icon', $parentid, 0, 0)"; - } else { + serendipity_db_query($query); + echo '<div class="serendipityAdminMsgSuccess">'. CATEGORY_SAVED .'</div>'; + } elseif ($serendipity['GET']['adminAction'] == 'edit') { /* Check to make sure parent is not a child of self */ - $r = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category c WHERE c.categoryid={$parentid} AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($cat_to_edit))); + $r = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category c WHERE c.categoryid={$parentid} AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange((int)$serendipity['GET']['cid']))); if ( !is_array($r) ) { - $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid, category_icon='$icon', parentid=$parentid WHERE categoryid=$cat_to_edit $admin_category"; + $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid, category_icon='$icon', parentid=$parentid WHERE categoryid=". (int)$serendipity['GET']['cid'] ." $admin_category"; + serendipity_db_query($query); + echo '<div class="serendipityAdminMsgSuccess">'. CATEGORY_SAVED .'</div>'; } else { $r = serendipity_db_query("SELECT category_name FROM {$serendipity['dbPrefix']}category WHERE categoryid={$parentid}"); @@ -38,17 +40,15 @@ } } - $r = empty($msg) ? serendipity_db_query($query) : $msg; serendipity_rebuildCategoryTree(); - if (is_string($r)) { - $msg = $r; - } else { - $msg = CATEGORY_SAVED; - } -} elseif (isset($_POST['REMOVE'])) { - if ($cat_to_edit != 0) { + $serendipity['GET']['adminAction'] = 'view'; +} + +/* Delete a category */ +if ($serendipity['GET']['adminAction'] == 'doDelete') { + if ($serendipity['GET']['cid'] != 0) { $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid']; - $category_range = implode(' AND ', serendipity_fetchCategoryRange($cat_to_edit)); + $category_range = implode(' AND ', serendipity_fetchCategoryRange((int)$serendipity['GET']['cid'])); if (strtolower($serendipity['dbType']) == 'postgres') { $query = "UPDATE {$serendipity['dbPrefix']}entrycat SET categoryid={$remaining_cat} WHERE entryid IN @@ -71,136 +71,136 @@ } if ( serendipity_db_query($query) ) { if ( serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE category_left BETWEEN {$category_range} {$admin_category}") ) { - $msg = $remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, $cat_to_edit, $remaining_cat) : sprintf(CATEGORY_DELETED, $cat_to_edit); + echo '<div class="serendipityAdminMsgSuccess">'. ($remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, (int)$serendipity['GET']['cid'], $remaining_cat) : sprintf(CATEGORY_DELETED,(int)$serendipity['GET']['cid'])) .'</div>'; + $serendipity['GET']['adminAction'] = 'view'; } } } else { - $msg = INVALID_CATEGORY; + echo '<div class="serendipityAdminMsgError">'. INVALID_CATEGORY .'</div>'; } - - $cat_to_edit = 0; } +?> -$cats = serendipity_fetchCategories('all'); - -$existing_cats_table = ''; -$existing_cats_dropdown = '<select name="serendipity[cat][remaining_catid]">' . "\n"; -$existing_cats_dropdown .= '<option value="0">- '. NO_CATEGORY .' -</option>' . "\n"; -if (isset($cats) && is_array($cats) && count($cats)) { +<?php + if ( $serendipity['GET']['adminAction'] == 'delete' ) { + if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF || $serendipity['authorid'] == $this_cat['authorid'] || $this_cat['authorid'] == '0') { +?> + <form method="POST" name="serendipityCategory" action="?serendipity[adminModule]=category&serendipity[adminAction]=doDelete&serendipity[cid]=<?php echo $serendipity['GET']['cid'] ?>"> + <br /> + <?php echo CATEGORY_REMAINING ?>: + <select name="serendipity[cat][remaining_catid]"> + <option value="0">- <?php echo NO_CATEGORY ?> -</option> +<?php + $cats = serendipity_fetchCategories('all'); + /* TODO, show dropdown as nested categories */ foreach ($cats as $cat_data) { - if ($serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || $cat_data['authorid'] == '0' || $cat_data['authorid'] == $serendipity['authorid']) { - if ($cat_to_edit > 0 && $cat_data['categoryid'] == $cat_to_edit && !isset($this_cat)) { - $this_cat = $cat_data; - } elseif ($cat_to_edit > 0) { - $existing_cats_dropdown .= '<option value="' . $cat_data['categoryid'] . '">' . htmlspecialchars($cat_data['category_name']) . '</option>' . "\n"; - } - } - - $name = htmlspecialchars($cat_data['category_name']); - $desc = htmlspecialchars($cat_data['category_description']); - $edit_pre = '<a href="?serendipity[adminModule]=category&serendipity[cat][catid]=' . $cat_data['categoryid'] . '">'; - $edit_post = '</a>'; - - if ($cat_data['authorid'] == '0') { - $desc .= ' (' . ALL_AUTHORS . ')'; - } elseif ($cat_data['authorid'] != $serendipity['authorid']) { - $desc .= ' (' . $cat_data['username'] . ')'; - $edit_pre = $edit_post = ''; + if ($cat_data['categoryid'] != $serendipity['GET']['cid'] && ($serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || $cat_data['authorid'] == '0' || $cat_data['authorid'] == $serendipity['authorid'])) { + echo '<option value="' . $cat_data['categoryid'] . '">' . htmlspecialchars($cat_data['category_name']) . '</option>' . "\n"; } - - $existing_cats_table .= <<<CAT - <tr> - <td> - • $edit_pre $name - $desc $edit_post</a> - </td> - </tr> -CAT; } -} - -$existing_cats_dropdown .= '</select>'; ?> -<div style="color: red"><?php echo $msg ; ?></div> - -<form method="POST" name="serendipityCategory"> - + </select> + <input type="submit" name="REMOVE" value="<?php echo GO ?>"> + </form> <?php -$remove = ''; -if ($cat_to_edit == 0) { - $desc = CREATE_NEW_CAT; - $save = CREATE; -} else { - $desc = htmlspecialchars(sprintf(EDIT_THIS_CAT, $this_cat['category_name'], $this_cat['category_description'])); - $save = SAVE; - if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF || $serendipity['authorid'] == $this_cat['authorid'] || $this_cat['authorid'] == '0') { - $remove = '<br /><br /><font size="1">' . sprintf(CATEGORY_REMAINING, $existing_cats_dropdown) .' <input type="submit" name="REMOVE" value="> "></font>'; + } } -} ?> -<?php echo $desc; ?> -<table cellpadding="5"> + + +<?php if ( $serendipity['GET']['adminAction'] == 'edit' || $serendipity['GET']['adminAction'] == 'new' ) { + if ( $serendipity['GET']['adminAction'] == 'edit' ) { + $this_cat = serendipity_fetchCategoryInfo($serendipity['GET']['cid']); + echo '<strong>'. sprintf(EDIT_THIS_CAT, htmlspecialchars($this_cat['category_name'])) .'</strong>'; + $save = SAVE; + } else { + echo '<strong>'. CREATE_NEW_CAT .'</strong>'; + $save = CREATE; + } +?> +<form method="POST" name="serendipityCategory"> +<table cellpadding="5" width="100%"> <tr> - <th><?php echo NAME; ?></th> + <td><?php echo NAME; ?></th> <td><input type="text" name="serendipity[cat][name]" value="<?php echo isset($this_cat['category_name']) ? htmlspecialchars($this_cat['category_name']) : ''; ?>" /></td> + <td rowspan="5" align="center" valign="middle" width="200" style="border: 1px solid #ccc"><img src="<?php echo isset($this_cat['category_icon']) ? $this_cat['category_icon'] : '' ?>" id="imagepreview" <?php echo empty($this_cat['category_icon']) ? 'style="display: none' : '' ?>"></td> </tr> <tr> - <th><?php echo DESCRIPTION; ?></th> + <td><?php echo DESCRIPTION; ?></th> <td><input type="text" name="serendipity[cat][description]" value="<?php echo isset($this_cat['category_description']) ? htmlspecialchars($this_cat['category_description']) : ''; ?>" /></td> </tr> <tr> - <th><?php echo IMAGE; ?></th> + <td><?php echo IMAGE; ?></th> <td> <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script> - <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" /> + <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';" /> <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" /> </td> </tr> <tr> - <th><label for="all_authors"><?php echo ALL_AUTHORS; ?></label></th> + <td><label for="all_authors"><?php echo ALL_AUTHORS; ?></label></th> <td><input id="all_authors" type="checkbox" name="serendipity[cat][all_authors]" value="true" <?php echo (isset($this_cat['authorid']) && $this_cat['authorid'] == '0') ? 'checked="checked"' : ''; ?> /></td> </tr> -<?php - if (isset($cats) && is_array($cats) && count($cats)) { -?> <tr> - <th><label for="parent_cat"><?php echo PARENT_CATEGORY; ?></label></th> + <td><label for="parent_cat"><?php echo PARENT_CATEGORY; ?></label></th> <td> <select id="parent_cat" name="serendipity[cat][parent_cat]"> - <option value="0"<?php if ( $cat_to_edit == 0 ) echo ' selected="selected"'; ?>>[ <?php echo NO_CATEGORY; ?> ]</option> + <option value="0"<?php if ( (int)$serendipity['GET']['cid'] == 0 ) echo ' selected="selected"'; ?>>[ <?php echo NO_CATEGORY; ?> ]</option> <?php - foreach ( $cats as $cat ) { - if ( $cat['categoryid'] == $cat_to_edit ) { - $parentid = $cat['parentid']; - } - } + $cats = serendipity_fetchCategories('all'); + foreach ( $cats as $cat ) { + if ( $cat['categoryid'] == (int)$serendipity['GET']['cid'] ) { + $parentid = $cat['parentid']; + } + } echo serendipity_generateCategoryList($cats, array($parentid), 2); ?> </select> </td> </tr> -<?php -} -?> </table> + <div><input type="submit" name="SAVE" value="<?php echo $save; ?>"/></div> +</form> +<?php } ?> -<div> - <input type="submit" name="SAVE" value="<?php echo $save; ?>"/> - <?php echo $remove; ?> -</div> -<br /> -<hr /> -<b><?php echo CLICK_CAT_TO_EDIT; ?></b> -<div> - <?php echo serendipity_generateCategoryList($cats, array($cat_to_edit)); ?> - <p><a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></p> -</div> -</form> + +<?php if ( $serendipity['GET']['adminAction'] == 'view' ) { + $cats = serendipity_fetchCategories('all'); + if ( is_array($cats) && sizeof($cats) > 0 ) { + echo CATEGORY_INDEX .':'; + } else { + echo '<div align="center">- '. NO_CATEGORIES .' -</div>'; + } +?> +<br /><br /> +<table cellspacing="0" cellpadding="4" width="100%" border=0> +<?php + $cats = serendipity_fetchCategories('all'); + if ( is_array($cats) ) { + $categories = serendipity_walkRecursive($cats, 'categoryid', 'parentid', VIEWMODE_THREADED); + foreach ( $categories as $category ) { +?> + <tr> + <td width="16"><a href="?serendipity[adminModule]=category&serendipity[adminAction]=edit&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png') ?>" border="0" /></a></td> + <td width="16"><a href="?serendipity[adminModule]=category&serendipity[adminAction]=delete&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" /></a></td> + <td width="16"><?php if ( !empty($category['category_icon']) ) {?><img src="<?php echo serendipity_getTemplateFile('admin/img/thumbnail.png') ?>" alt="" /><?php } else echo ' ' ?></td> + <td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;"> <?php echo $category['category_name'] ?></td> + <td><?php echo $category['category_description'] ?></td> + <td align="right"><?php echo ($category['authorid'] == '0' ? ALL_AUTHORS : $category['username']); ?></td> + </tr> +<?php } + } ?> + <tr> + <td colspan="6" align="right"><input type="button" value="<?php echo CREATE_NEW_CAT ?>" onclick="location.href='?serendipity[adminModule]=category&serendipity[adminAction]=new'"></td> + </tr> +</table> +<?php } ?> <?php /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:47:13
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13006 Modified Files: serendipity_admin.php serendipity_editor.js Log Message: - Redesign and partly rewrite category management TODO: needs the even/uneven css class, somehow Index: serendipity_editor.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- serendipity_editor.js 11 Aug 2004 20:56:00 -0000 1.15 +++ serendipity_editor.js 15 Dec 2004 19:46:34 -0000 1.16 @@ -135,6 +135,7 @@ { document.getElementById(el).value = str; document.getElementById(el).focus(); + document.getElementById(el).onchange(); } function serendipity_imageSelector_addToBody (str, textarea) Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- serendipity_admin.php 10 Dec 2004 16:56:00 -0000 1.55 +++ serendipity_admin.php 15 Dec 2004 19:46:34 -0000 1.56 @@ -121,65 +121,60 @@ } else { ?> - <td id="serendipitySideBar"> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarContent"> - <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> - <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br /> - </div> - </div> - - <ul class="serendipitySideBarMenu"> - <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> - </ul> + <td id="serendipitySideBar"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> + <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br /> + </div> + </div> - <ul class="serendipitySideBarMenu"> - <lh><?php echo CATEGORIES; ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=editSelect"><?php echo EDIT_CATEGORIES; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_categories', $serendipity); ?> - </ul> + <ul class="serendipitySideBarMenu"> + <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> + </ul> - <ul class="serendipitySideBarMenu"> - <lh><?php echo MEDIA; ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li> + <ul class="serendipitySideBarMenu"> + <lh><?php echo MEDIA; ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li> <?php } ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> - </ul> + <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> + </ul> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <ul class="serendipitySideBarMenu"> - <lh><?php echo APPEARANCE; ?></lh> - <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> - </ul> + <ul class="serendipitySideBarMenu"> + <lh><?php echo APPEARANCE; ?></lh> + <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + </ul> <?php } ?> - <ul class="serendipitySideBarMenu"> - <lh><?php echo ADMIN; ?></lh> + <ul class="serendipitySideBarMenu"> + <lh><?php echo ADMIN; ?></lh> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li> <?php } ?> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li> <?php } ?> - <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> - </ul> + <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> + </ul> - <ul class="serendipitySideBarMenu"> - <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li> - <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li> - </ul> + <ul class="serendipitySideBarMenu"> + <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li> + <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li> + </ul> </td> <td id="content"> |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13006/lang Modified Files: serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php serendipity_lang_tn.inc.php serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php Log Message: - Redesign and partly rewrite category management TODO: needs the even/uneven css class, somehow Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- serendipity_lang_cs.inc.php 11 Dec 2004 14:39:43 -0000 1.82 +++ serendipity_lang_cs.inc.php 15 Dec 2004 19:46:36 -0000 1.83 @@ -32,7 +32,6 @@ @define('LOGOUT', 'Odhláení'); @define('LOGGEDOUT', 'Odhláen'); @define('CREATE', 'Vytvoøit'); -@define('EDIT_THIS_CAT', 'Editace "%s - %s"'); @define('SAVE', 'Uloit'); @define('NAME', 'Jméno'); @define('CLICK_CAT_TO_EDIT', 'Zvolte kategorii pro editaci '); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'Zruen záznam #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategorie #%s byla zruena. Starí záznamy byly pøemístìny do #%s'); @define('CATEGORY_DELETED', 'Kategorie #%s byla zru~Zena.'); -@define('CATEGORY_REMAINING', 'Zruit kategorii a záznamy pøemístit do: %s'); @define('INVALID_CATEGORY', 'ádná kategorie nebyla urèena k vymazání'); @define('CATEGORY_SAVED', 'Kategorie uloena'); @define('SELECT_TEMPLATE', 'Vyberte vzor pro Vá weblog'); @@ -655,6 +653,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- serendipity_lang_no.inc.php 11 Dec 2004 14:39:44 -0000 1.23 +++ serendipity_lang_no.inc.php 15 Dec 2004 19:46:39 -0000 1.24 @@ -25,7 +25,6 @@ @define('LOGOUT', 'Logg ut'); @define('LOGGEDOUT', 'Logget ut.'); @define('CREATE', 'Opprett'); -@define('EDIT_THIS_CAT', 'Redigerer "%s - %s"'); @define('SAVE', 'Lagre'); @define('NAME', 'Navn'); @define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for å redigere den'); @@ -169,7 +168,6 @@ @define('RIP_ENTRY', 'Farvel artikel #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategori #%s ble slettet. Gamle artikler flyttet til kategori #%s'); @define('CATEGORY_DELETED', 'Kategori #%s ble slettet.'); -@define('CATEGORY_REMAINING', 'Slet denne kategoriem og flytt artiklene dens til denne kategori: %s'); @define('INVALID_CATEGORY', 'Ingen kategori ble valgt for sletting'); @define('CATEGORY_SAVED', 'Kategori lagret'); @define('SELECT_TEMPLATE', 'Velg den malen du ønsker å bruke til din blog'); @@ -650,5 +648,9 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate -?> +?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- serendipity_lang_nl.inc.php 11 Dec 2004 14:39:44 -0000 1.58 +++ serendipity_lang_nl.inc.php 15 Dec 2004 19:46:38 -0000 1.59 @@ -34,7 +34,6 @@ @define('LOGOUT', 'Loguit'); @define('LOGGEDOUT', 'Uitgelogged.'); @define('CREATE', 'Aanmaken'); -@define('EDIT_THIS_CAT', 'Bewerken "%s - %s"'); @define('SAVE', 'Bewaren'); @define('NAME', 'Naam'); @define('CLICK_CAT_TO_EDIT', 'Klik op een categorie om deze te bewerken'); @@ -178,7 +177,6 @@ @define('DUMP_IT', 'Doe weg!'); @define('RIP_ENTRY', 'R.I.P. log #%s'); @define('CATEGORY_DELETED', 'Categorie #%s is verwijderd. Oude logs werden verplaatst naar #%s'); -@define('CATEGORY_REMAINING', 'Verwijder deze categorie en verplaats de logs naar de categorie: %s'); @define('INVALID_CATEGORY', 'Geen categorie opgegeven om te verwijderen'); @define('CATEGORY_SAVED', 'Categorie is bewaard'); @define('SELECT_TEMPLATE', 'Kies de template die je wilt gebruiken voor je blog'); @@ -660,6 +658,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- serendipity_lang_en.inc.php 11 Dec 2004 14:39:44 -0000 1.102 +++ serendipity_lang_en.inc.php 15 Dec 2004 19:46:37 -0000 1.103 @@ -32,7 +32,6 @@ @define('LOGOUT', 'Logout'); @define('LOGGEDOUT', 'Logged out.'); @define('CREATE', 'Create'); -@define('EDIT_THIS_CAT', 'Editing "%s - %s"'); @define('SAVE', 'Save'); @define('NAME', 'Name'); @define('CLICK_CAT_TO_EDIT', 'Click on a category to edit it'); @@ -66,7 +65,6 @@ @define('AUTHOR_SUITE', 'Authoring Suite'); @define('EDIT_ENTRIES', 'Edit entries'); @define('CATEGORIES', 'Categories'); -@define('EDIT_CATEGORIES', 'Manage Categories'); @define('WARNING_THIS_BLAHBLAH', "WARNING:\\nThis may take a long time if there are many images without thumbnails."); @define('CREATE_THUMBS', 'Rebuild Thumbs'); @define('MANAGE_IMAGES', 'Manage images'); @@ -180,7 +178,6 @@ @define('RIP_ENTRY', 'R.I.P. entry #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); @define('CATEGORY_DELETED', 'Category #%s deleted.'); -@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category: %s'); @define('INVALID_CATEGORY', 'No category was provided for deletion'); @define('CATEGORY_SAVED', 'Category saved'); @define('SELECT_TEMPLATE', 'Select the template you wish to use for your blog'); @@ -652,7 +649,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); - +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_tw.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- serendipity_lang_tw.inc.php 11 Dec 2004 14:39:45 -0000 1.18 +++ serendipity_lang_tw.inc.php 15 Dec 2004 19:46:40 -0000 1.19 @@ -32,7 +32,6 @@ @define('LOGOUT', 'µn¥X'); @define('LOGGEDOUT', 'µn¥X.'); @define('CREATE', '«Ø¥ß'); -@define('EDIT_THIS_CAT', '½s¿è "%s - %s"'); @define('SAVE', 'Àx¦s'); @define('NAME', '¦WºÙ'); @define('CLICK_CAT_TO_EDIT', 'ÂIÃþ§O¶i¦æ½s¿è'); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'R.I.P. ¤å³¹ #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Ãþ§O #%s ¤w§R°£. ¤峹¤w³Q²¾°Ê¨ìÃþ§O #%s'); @define('CATEGORY_DELETED', 'Ãþ§O #%s ¤w§R°£.'); -@define('CATEGORY_REMAINING', '§R°£³oÓÃþ§OµM«á²¾°Ê¤å³¹¨ì: %s'); @define('INVALID_CATEGORY', '¨S¦³´£¨Ñ§R°£ªºÃþ§O'); @define('CATEGORY_SAVED', 'Ãþ§O¤wÀx¦s'); @define('SELECT_TEMPLATE', '½Ð¿ï¾Üºô¸ô¤é°Oªº§G´º'); @@ -653,6 +651,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- serendipity_lang_bg.inc.php 11 Dec 2004 14:39:43 -0000 1.36 +++ serendipity_lang_bg.inc.php 15 Dec 2004 19:46:36 -0000 1.37 @@ -28,7 +28,6 @@ @define('LOGOUT', 'Èçõîä'); @define('LOGGEDOUT', 'Âèå èçëÿçîõòå.'); @define('CREATE', 'Ñúçäàé'); -@define('EDIT_THIS_CAT', 'Ðåäàêòèðàíå íå "%s - %s"'); @define('SAVE', 'Çàïàçè'); @define('NAME', 'Èìå'); @define('CLICK_CAT_TO_EDIT', 'Êëèêíåòå íà êàòåãîðèÿòà çà äà ìîæåòå äà ÿ ðåäàêòèðàòå'); @@ -172,7 +171,6 @@ @define('DUMP_IT', 'Äàâàé it!'); @define('RIP_ENTRY', 'Ïî÷åâàé â ìèð, íîìåð #%s'); @define('CATEGORY_DELETED', 'ÊÀòåãîðèÿòà #%s å èçòðèòà. Ñòàòèèòå ñà ïðåìåñòåíè êúì êàòåãîðèÿ #%s'); -@define('CATEGORY_REMAINING', 'Èçòðèéòå òàçè êàòåãîðèÿ è ïðåìåñòåòå ñúäúðæàíèåòî é êúì êàòåãîðèÿ: %s'); @define('INVALID_CATEGORY', 'Íÿìà êàòåãîðèÿ çà èçòðèâàíå'); @define('CATEGORY_SAVED', 'ÊÀòåãîðèÿòà å çàïàçåíà'); @define('SELECT_TEMPLATE', 'ÈÇáåðåòå âúíøíèÿ âèä íà áëîã-à ñè'); @@ -637,6 +635,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- serendipity_lang_pt.inc.php 11 Dec 2004 14:39:44 -0000 1.58 +++ serendipity_lang_pt.inc.php 15 Dec 2004 19:46:40 -0000 1.59 @@ -30,7 +30,6 @@ @define('LOGOUT', 'Logout'); @define('LOGGEDOUT', 'Logged out.'); @define('CREATE', 'Criar'); -@define('EDIT_THIS_CAT', 'Editando "%s - %s"'); @define('SAVE', 'Salvar'); @define('NAME', 'Nome'); @define('CLICK_CAT_TO_EDIT', 'Clique em uma categoria para editá-la'); @@ -174,7 +173,6 @@ @define('DUMP_IT', 'Suma com ele!'); @define('RIP_ENTRY', 'Até nunca mais artigo #%s'); @define('CATEGORY_DELETED', 'Categoria #%s excluída. Os artigos antigos foram movidos para a categoria #%s'); -@define('CATEGORY_REMAINING', 'Excluir esta categoria e mover seus artigos para a categoria: %s'); @define('INVALID_CATEGORY', 'Nenhuma categoria fornecida para exclusão'); @define('CATEGORY_SAVED', 'Categoria salva'); @define('SELECT_TEMPLATE', 'Selecione o template desejado para o seu Blog'); @@ -656,6 +654,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_lang_it.inc.php 11 Dec 2004 14:39:44 -0000 1.22 +++ serendipity_lang_it.inc.php 15 Dec 2004 19:46:38 -0000 1.23 @@ -32,7 +32,6 @@ @define('LOGOUT', 'Logout'); @define('LOGGEDOUT', 'Scollegato.'); @define('CREATE', 'Crea'); -@define('EDIT_THIS_CAT', 'Modifica "%s - %s"'); @define('SAVE', 'Salva'); @define('NAME', 'Nome'); @define('CLICK_CAT_TO_EDIT', 'Clicka su una categoria per modificarla'); @@ -179,7 +178,6 @@ @define('RIP_ENTRY', 'Addio notizia #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Categoria #%s cancellata. Vecchi articoli spostati nella categoria #%s'); @define('CATEGORY_DELETED', 'Categoria #%s cancellata.'); -@define('CATEGORY_REMAINING', 'Cancella questa categoria e sposta le notizie nella categoria: %s'); @define('INVALID_CATEGORY', 'Nessuna categoria selezionata per la cancellazione'); @define('CATEGORY_SAVED', 'Categoria salvata'); @define('SELECT_TEMPLATE', 'Seleziona il modello che vuoi usare per il tuo blog'); @@ -655,6 +653,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- serendipity_lang_da.inc.php 11 Dec 2004 14:39:44 -0000 1.102 +++ serendipity_lang_da.inc.php 15 Dec 2004 19:46:37 -0000 1.103 @@ -28,7 +28,6 @@ @define('LOGOUT', 'Log ud'); @define('LOGGEDOUT', 'Logget ud.'); @define('CREATE', 'Opret'); -@define('EDIT_THIS_CAT', 'Redigerer "%s - %s"'); @define('SAVE', 'Gem'); @define('NAME', 'Navn'); @define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for at redigere den'); @@ -172,7 +171,6 @@ @define('RIP_ENTRY', 'Farvel artikel #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategori #%s blev slettet. Gamle artikler flyttet til kategori #%s'); @define('CATEGORY_DELETED', 'Kategori #%s blev slettet.'); -@define('CATEGORY_REMAINING', 'Slet denne kategori og flyt dens artikler til denne kategori: %s'); @define('INVALID_CATEGORY', 'Ingen kategori blev valgt til sletning'); @define('CATEGORY_SAVED', 'Kategori gemt'); @define('SELECT_TEMPLATE', 'Vælg den skabelon du ønsker at bruge til din blog'); @@ -650,6 +648,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- serendipity_lang_fr.inc.php 11 Dec 2004 14:39:44 -0000 1.81 +++ serendipity_lang_fr.inc.php 15 Dec 2004 19:46:38 -0000 1.82 @@ -34,7 +34,6 @@ @define('LOGOUT', 'Se déconnecter'); @define('LOGGEDOUT', 'Déconnecté.'); @define('CREATE', 'Créer'); -@define('EDIT_THIS_CAT', 'Éditer "%s - %s"'); @define('SAVE', 'Enregistrer'); @define('NAME', 'Nom'); @define('CLICK_CAT_TO_EDIT', 'Cliquez sur une catégorie pour l\'éditer'); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'Le billet #%s a rejoint l\'éternel.'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Catégorie #%s supprimée. Les billets ont été déplacés dans la catégorie #%s'); @define('CATEGORY_DELETED', 'Catégorie #%s supprimée.'); -@define('CATEGORY_REMAINING', 'Supprimer cette catégorie et déplacer les billets dans la catégorie: %s'); @define('INVALID_CATEGORY', 'Aucune catégorie sélectionnée pour la suppression'); @define('CATEGORY_SAVED', 'Catégorie sauvegardée'); @define('SELECT_TEMPLATE', 'Sélectionnez le thème que vous voulez utiliser pour votre blog'); @@ -658,6 +656,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- serendipity_lang_cz.inc.php 11 Dec 2004 14:39:44 -0000 1.82 +++ serendipity_lang_cz.inc.php 15 Dec 2004 19:46:37 -0000 1.83 @@ -32,7 +32,6 @@ @define('LOGOUT', 'Odhlá¹ení'); @define('LOGGEDOUT', 'Odhlá¹en'); @define('CREATE', 'Vytvoøit'); -@define('EDIT_THIS_CAT', 'Editace "%s - %s"'); @define('SAVE', 'Ulo¾it'); @define('NAME', 'Jméno'); @define('CLICK_CAT_TO_EDIT', 'Zvolte kategorii pro editaci '); @@ -177,7 +176,6 @@ @define('RIP_ENTRY', 'Zru¹en záznam #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategorie #%s byla zru¹ena. Star¹í záznamy byly pøemístìny do #%s'); @define('CATEGORY_DELETED', 'Kategorie #%s byla zru~Zena.'); -@define('CATEGORY_REMAINING', 'Zru¹it kategorii a záznamy pøemístit do: %s'); @define('INVALID_CATEGORY', '®ádná kategorie nebyla urèena k vymazání'); @define('CATEGORY_SAVED', 'Kategorie ulo¾ena'); @define('SELECT_TEMPLATE', 'Vyberte vzor pro Vá¹ weblog'); @@ -653,6 +651,10 @@ @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- serendipity_lang_es.inc.php 11 Dec 2004 14:39:44 -0000 1.98 +++ serendipity_lang_es.inc.php 15 Dec 2004 19:46:38 -0000 1.99 @@ -32,7 +32,6 @@ @define('LOGGEDOUT', 'No identificado'); @define('CREATE_NEW_CAT', 'Crear una categoría nueva'); @define('CREATE', 'Crear'); -@define('EDIT_THIS_CAT', 'Editar "%s - %s"'); @define('SAVE', 'Guardar'); @define('NAME', 'Nombre'); @define('CLICK_CAT_TO_EDIT', 'Haz click en una categoría para editarla'); @@ -175,7 +174,6 @@ @define('RIP_ENTRY', 'R.I.P, #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Categoría #%s eliminada. Los artículos antiguos han sido movidos a la categoría #%s'); @define('CATEGORY_DELETED', 'Categoría #%s eliminada.'); -@define('CATEGORY_REMAINING', 'Borra esta categoría y mueve sus posts a esta otra: %s'); @define('INVALID_CATEGORY', 'Ninguna categoría valida para borrar'); @define('CATEGORY_SAVED', 'Categoría guardada'); @define('SELECT_TEMPLATE', 'Selecciona la plantilla que deseas utilizar en tu weblog'); @@ -659,6 +657,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_cn.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_cn.inc.php 11 Dec 2004 14:39:43 -0000 1.3 +++ serendipity_lang_cn.inc.php 15 Dec 2004 19:46:36 -0000 1.4 @@ -32,7 +32,6 @@ @define('LOGOUT', 'ç»åº'); @define('LOGGEDOUT', 'ç»åº.'); @define('CREATE', '建ç«'); -@define('EDIT_THIS_CAT', 'ç¼è¾ "%s - %s"'); @define('SAVE', 'å¨å'); @define('NAME', 'å称'); @define('CLICK_CAT_TO_EDIT', 'ç¹ç±»å«è¿è¡ç¼è¾'); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'R.I.P. æç« #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'ç±»å« #%s å·²å é¤. æ§æç« å·²è¢«ç§»å¨å°ç±»å« #%s'); @define('CATEGORY_DELETED', 'ç±»å« #%s å·²å é¤.'); -@define('CATEGORY_REMAINING', 'å é¤è¿ä¸ªç±»å«ç¶å移å¨æç« å°: %s'); @define('INVALID_CATEGORY', '没ææä¾å é¤çç±»å«'); @define('CATEGORY_SAVED', 'ç±»å«å·²å¨å'); @define('SELECT_TEMPLATE', '请éæ©ç½è·¯æ¥è®°çå¸æ¯'); @@ -653,6 +651,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_tn.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_tn.inc.php 11 Dec 2004 14:39:44 -0000 1.3 +++ serendipity_lang_tn.inc.php 15 Dec 2004 19:46:40 -0000 1.4 @@ -32,7 +32,6 @@ @define('LOGOUT', 'ç»åº'); @define('LOGGEDOUT', 'ç»åº.'); @define('CREATE', '建ç«'); -@define('EDIT_THIS_CAT', '編輯 "%s - %s"'); @define('SAVE', 'å²å'); @define('NAME', 'å稱'); @define('CLICK_CAT_TO_EDIT', 'é»é¡å¥é²è¡ç·¨è¼¯'); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'R.I.P. æç« #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'é¡å¥ #%s å·²åªé¤. èæç« å·²è¢«ç§»åå°é¡å¥ #%s'); @define('CATEGORY_DELETED', 'é¡å¥ #%s å·²åªé¤.'); -@define('CATEGORY_REMAINING', 'åªé¤éåé¡å¥ç¶å¾ç§»åæç« å°: %s'); @define('INVALID_CATEGORY', 'æ²ææä¾åªé¤çé¡å¥'); @define('CATEGORY_SAVED', 'é¡å¥å·²å²å'); @define('SELECT_TEMPLATE', 'è«é¸æ網路æ¥è¨çä½æ¯'); @@ -653,6 +651,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- serendipity_lang_de.inc.php 11 Dec 2004 14:39:44 -0000 1.123 +++ serendipity_lang_de.inc.php 15 Dec 2004 19:46:37 -0000 1.124 @@ -31,7 +31,6 @@ @define('LOGOUT', 'Abmelden'); @define('LOGGEDOUT', 'Abgemeldet.'); @define('CREATE', 'Erstellen'); -@define('EDIT_THIS_CAT', '"%s - %s" bearbeiten'); @define('SAVE', 'Speichern'); @define('NAME', 'Name'); @define('SEND_MAIL_TO', 'Mail schicken an'); @@ -176,7 +175,6 @@ @define('RIP_ENTRY', 'Ruhe in Frieden, #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategorie #%s wurde gelöscht. Alte Artikel in dieser Kategorie nach %s verschoben'); @define('CATEGORY_DELETED', 'Kategorie #%s wurde gelöscht.'); -@define('CATEGORY_REMAINING', 'Diese Kategorie löschen und zugeordnete Artikel (falls vorhanden) nach #%s verschieben.'); @define('INVALID_CATEGORY', 'Es wurde keine Kategorie zum Löschen gewählt.'); @define('CATEGORY_SAVED', 'Kategorie gespeichert'); @define('SELECT_TEMPLATE', 'Wählen Sie das Template für das Blog'); @@ -652,6 +650,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'Die Suche konnte nicht wie gewünscht ausgeführt werden. Hinweis für den Administrator dieses Blogs: Der Fehler kann durch fehlende Index-Schlüssel der Datenbank verursacht werden. Auf MySQL-Systemen muss der Datenbankbenutzer-Account in der Lage sein, Index-Schlüssel zu erstellen und folgende Abfrage auszuführen: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> Die genaue Fehlermeldung der Datenbank bei der Suche lautete: <pre>%s</pre>'); +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_zh.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_zh.inc.php 11 Dec 2004 14:39:45 -0000 1.3 +++ serendipity_lang_zh.inc.php 15 Dec 2004 19:46:40 -0000 1.4 @@ -32,7 +32,6 @@ @define('LOGOUT', 'µÇ³ö'); @define('LOGGEDOUT', 'µÇ³ö.'); @define('CREATE', '½¨Á¢'); -@define('EDIT_THIS_CAT', '±à¼ "%s - %s"'); @define('SAVE', '´¢´æ'); @define('NAME', 'Ãû³Æ'); @define('CLICK_CAT_TO_EDIT', 'µãÀà±ð½øÐбà¼'); @@ -178,7 +177,6 @@ @define('RIP_ENTRY', 'R.I.P. ÎÄÕ #%s'); @define('CATEGORY_DELETED_ARTICLES_MOVED', 'Àà±ð #%s ÒÑɾ³ý. ¾ÉÎÄÕÂÒѱ»Òƶ¯µ½Àà±ð #%s'); @define('CATEGORY_DELETED', 'Àà±ð #%s ÒÑɾ³ý.'); -@define('CATEGORY_REMAINING', 'ɾ³ýÕâ¸öÀà±ðÈ»ºóÒƶ¯ÎÄÕµ½: %s'); @define('INVALID_CATEGORY', 'ûÓÐÌṩɾ³ýµÄÀà±ð'); @define('CATEGORY_SAVED', 'Àà±ðÒÑ´¢´æ'); @define('SELECT_TEMPLATE', 'ÇëÑ¡ÔñÍø·ÈռǵIJ¼¾°'); @@ -653,6 +651,10 @@ @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate @define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate @define('SEARCH_ERROR', 'The search function did not work as expected. Notice for the administrator of this blog: This may happen because of missing index keys in your database. On MySQL systems your database user account needs to be privileged to execute this query: <pre>CREATE FULLTEXT INDEX entry_idx on %sentries (title,body,extended)</pre> The specific error returned by the database was: <pre>%s</pre>'); // Translate +@define('EDIT_THIS_CAT', 'Editing "%s"'); // Translate +@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category'); // Translate +@define('CATEGORY_INDEX', 'Below is a list of categories available to your entries'); // Translate +@define('NO_CATEGORIES', 'No categories'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Tom S. <tom...@us...> - 2004-12-15 19:46:49
|
Update of /cvsroot/php-blog/serendipity/templates/default/admin/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13006/templates/default/admin/img Modified Files: delete.png Added Files: delete_image.png edit.png folder.png thumbnail.png Log Message: - Redesign and partly rewrite category management TODO: needs the even/uneven css class, somehow Index: delete.png =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/img/delete.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsSBIbFp and /tmp/cvsbgPU81 differ --- NEW FILE: folder.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: edit.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: delete_image.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: thumbnail.png --- (This appears to be a binary file; contents omitted.) |
|
From: Garvin H. <gar...@us...> - 2004-12-14 19:05:22
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10850/include Modified Files: plugin_api.inc.php Log Message: to let plugins be loadable during upgrade, allow this query to fail Index: plugin_api.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- plugin_api.inc.php 6 Dec 2004 12:45:42 -0000 1.8 +++ plugin_api.inc.php 14 Dec 2004 19:05:11 -0000 1.9 @@ -290,7 +290,7 @@ if (!class_exists($name)) { if (empty($pluginPath)) { $sql = "SELECT path from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'"; - $plugdata = serendipity_db_query($sql, true); + $plugdata = serendipity_db_query($sql, true, 'both', false); if (is_array($plugdata) && isset($plugdata[0])) { $pluginPath = $plugdata[0]; } |
|
From: Jannis H. <jhe...@us...> - 2004-12-13 22:25:25
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12493/include/admin Modified Files: installer.inc.php Log Message: Move the db-table-creation-tasks back into a function for others to use. To make sure it works, can somebody try an install with this modification? It worked here, but you never know :-) Index: installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- installer.inc.php 9 Dec 2004 22:31:27 -0000 1.12 +++ installer.inc.php 13 Dec 2004 22:25:14 -0000 1.13 @@ -412,12 +412,7 @@ echo '<br />'; echo CREATE_DATABASE; - $queries = serendipity_parse_sql_tables(S9Y_INCLUDE_PATH . 'sql/db.sql'); - $queries = str_replace('{PREFIX}', $serendipity['dbPrefix'], $queries); - - foreach ($queries as $query) { - serendipity_db_schema_import($query); - } + serendipity_installDatabase(); echo ' <strong>' . DONE . '</strong><br />'; echo sprintf(CREATING_PRIMARY_AUTHOR, $_POST['user']) .'...'; |
|
From: Jannis H. <jhe...@us...> - 2004-12-13 22:25:24
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12493/include Modified Files: functions_installer.inc.php Log Message: Move the db-table-creation-tasks back into a function for others to use. To make sure it works, can somebody try an install with this modification? It worked here, but you never know :-) Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- functions_installer.inc.php 13 Dec 2004 15:55:48 -0000 1.20 +++ functions_installer.inc.php 13 Dec 2004 22:25:13 -0000 1.21 @@ -63,6 +63,20 @@ return true; } +/** +* Creates the needed tables - beware, they will be empty and need to be stuffed with +* default templates and such... +*/ +function serendipity_installDatabase() { + global $serendipity; + $queries = serendipity_parse_sql_tables(S9Y_INCLUDE_PATH . 'sql/db.sql'); + $queries = str_replace('{PREFIX}', $serendipity['dbPrefix'], $queries); + + foreach ($queries as $query) { + serendipity_db_schema_import($query); + } +} + function serendipity_query_default($optname, $default, $usertemplate = false, $type = 'string') { global $serendipity; |
|
From: Garvin H. <gar...@us...> - 2004-12-13 15:56:10
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12432/include Modified Files: functions_installer.inc.php Log Message: SCRIPT_FILENAME always points to CGI executable in CGI environments. Use PHP_SELF there. Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- functions_installer.inc.php 10 Dec 2004 10:59:05 -0000 1.19 +++ functions_installer.inc.php 13 Dec 2004 15:55:48 -0000 1.20 @@ -687,7 +687,7 @@ } function serendipity_httpCoreDir() { - if (!empty($_SERVER['SCRIPT_FILENAME'])) { + if (!empty($_SERVER['SCRIPT_FILENAME']) && substr(php_sapi_name(), 0, 3) != 'cgi') { return dirname($_SERVER['SCRIPT_FILENAME']) . '/'; } |
|
From: Garvin H. <gar...@us...> - 2004-12-13 15:26:03
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5265/include Modified Files: functions_config.inc.php functions_entries.inc.php Log Message: two new hooks for the upcoming multilinguage plugin Index: functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- functions_config.inc.php 11 Dec 2004 17:28:06 -0000 1.10 +++ functions_config.inc.php 13 Dec 2004 15:25:39 -0000 1.11 @@ -342,11 +342,13 @@ function serendipity_iframe_create($mode, &$entry) { global $serendipity; + if (!empty($serendipity['POST']['no_save'])) { + return true; + } + $_SESSION['save_entry'] = $entry; $_SESSION['save_entry_POST'] = $serendipity['POST']; - // TODO: Use a language constant for those strings - $attr = ''; switch($mode) { case 'save': Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- functions_entries.inc.php 13 Dec 2004 12:29:00 -0000 1.23 +++ functions_entries.inc.php 13 Dec 2004 15:25:39 -0000 1.24 @@ -850,6 +850,8 @@ return implode("\n", $errors); } + serendipity_plugin_api::hook_event('backend_entry_presave', $entry); + $categories = $entry['categories']; unset($entry['categories']); @@ -1070,6 +1072,8 @@ $draftP = ''; $categoryselector_expanded = false; + serendipity_plugin_api::hook_event('backend_entryform', $entry); + if (isset($entry['isdraft']) && $entry['isdraft'] == 'true') { $draftD = ' selected="selected"'; } else { |
|
From: Tom S. <tom...@us...> - 2004-12-13 12:29:12
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30705/include Modified Files: functions_entries.inc.php Log Message: - Fix paging and simplify the paging function - When using paging, use the rewrite rules to make sexy pages /P[n].html TODO: Fix header title when browsing frontpage pages Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- functions_entries.inc.php 11 Dec 2004 14:39:43 -0000 1.22 +++ functions_entries.inc.php 13 Dec 2004 12:29:00 -0000 1.23 @@ -450,48 +450,33 @@ return $search; } -/** Print a footer below the list of entries - * - **/ function serendipity_printEntryFooter($short_output = false) { -global $serendipity; - - if (!$short_output) { - // build the query string with variables we want to carry from each page to page - $add_query = ''; - if (is_array($serendipity['GET'])) { - $page_get_array = $serendipity['GET']; - if ((isset($serendipity['GET']['calendarZoom']) && isset($serendipity['GET']['range']) && $serendipity['GET']['calendarZoom'] == $serendipity['GET']['range']) - || (!isset($serendipity['GET']['calendarZoom']) && $serendipity['GET']['action'] != 'read')) { - // The 'range' variable is always set by the layout.php, even if we didn't specify one. But to still be able to paginate through ALL entries, we need to not propagate this variable in special cases where s9y automatically sets the 'range' variable. - unset($page_get_array['range']); - } + global $serendipity; - unset($page_get_array['page']); - unset($page_get_array['action']); - unset($page_get_array['adminAction']); + if ($short_output) { + return; + } - foreach($page_get_array AS $skey => $sval) { - $add_query .= '&serendipity[' . urlencode($skey) . ']=' . urlencode($sval); - } - } + $totalEntries = serendipity_getTotalEntries(); + $totalPages = ceil($totalEntries / $serendipity['fetchLimit']); - $totalEntries = serendipity_getTotalEntries(); - $totalPages = ceil($totalEntries / $serendipity['fetchLimit']); + if (!isset($serendipity['GET']['page'])) { + $serendipity['GET']['page'] = 1; + } - if (!isset($serendipity['GET']['page'])) { - $serendipity['GET']['page'] = 1; - } - if ($serendipity['GET']['page'] > 1) { - $serendipity['smarty']->assign('footer_prev_page', $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query); - } + if ($serendipity['GET']['page'] > 1) { + $uriArguments = $serendipity['uriArguments']; + $uriArguments[] = 'P'. ($serendipity['GET']['page'] - 1); + $serendipity['smarty']->assign('footer_prev_page', serendipity_rewriteURL(implode('/', $uriArguments) .'.html')); + } - $serendipity['smarty']->assign('footer_info', sprintf(PAGE_BROWSE_ENTRIES, $serendipity['GET']['page'], $totalPages, $totalEntries)); + $serendipity['smarty']->assign('footer_info', sprintf(PAGE_BROWSE_ENTRIES, (int)$serendipity['GET']['page'], $totalPages, $totalEntries)); - if ($serendipity['GET']['page'] < $totalPages) { - $serendipity['smarty']->assign('footer_next_page', $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query); - } + if ($serendipity['GET']['page'] < $totalPages) { + $uriArguments = $serendipity['uriArguments']; + $uriArguments[] = 'P'. ($serendipity['GET']['page'] + 1); + $serendipity['smarty']->assign('footer_next_page', serendipity_rewriteURL(implode('/', $uriArguments) .'.html')); } } |
|
From: Tom S. <tom...@us...> - 2004-12-13 12:29:10
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30705 Modified Files: index.php Log Message: - Fix paging and simplify the paging function - When using paging, use the rewrite rules to make sexy pages /P[n].html TODO: Fix header title when browsing frontpage pages Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- index.php 10 Dec 2004 19:58:00 -0000 1.63 +++ index.php 13 Dec 2004 12:28:45 -0000 1.64 @@ -28,6 +28,16 @@ $track_referer = true; $uri = $_SERVER['REQUEST_URI']; +/* Explode the path into sections, to later be able to check for arguments and add our own */ +preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') .'('. preg_quote($serendipity['indexFile'], '/') .'\?\/)?([a-z0-9\-*\/]+)/i', $uri, $_res); +if ( strlen($_res[2]) != 0 ) { + $serendipity['uriArguments'] = explode('/', $_res[2]); +} else { + $serendipity['uriArguments'] = array(); +} + + + if (isset($_SERVER['HTTP_REFERER']) && empty($_SESSION['HTTP_REFERER'])) { $_SESSION['HTTP_REFERER'] = $_SERVER['HTTP_REFERER']; } @@ -37,7 +47,7 @@ define('DATA_UNSUBSCRIBED', urldecode($res[1])); } - $uri = '/' . PATH_UNSUBSCRIBE . '/' . $res[2] . '_untitled.html'; + $uri = '/' . PATH_UNSUBSCRIBE . '/' . $res[2] . '-untitled.html'; } if (preg_match(PAT_DELETE, $uri, $res) && $serendipity['serendipityAuthedUser'] === true) { @@ -58,28 +68,43 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range']) && is_numeric($serendipity['GET']['range'])) { - preg_match_all('@/([a-z0-9]+)@i', $matches[1], $args); + $_args = $serendipity['uriArguments']; /* Attempt to locate hidden variables within the URI */ - foreach ($args[1] as $k => $v){ + foreach ($_args as $k => $v){ + if ($v == PATH_ARCHIVES) { + continue; + } if ($v{0} == 'C') { /* category */ $serendipity['GET']['category'] = substr($v, 1); - unset($args[1][$k]); + unset($_args[$k]); } elseif ($v{0} == 'W') { /* Week */ $week = substr($v, 1); - unset($args[1][$k]); + unset($_args[$k]); } elseif ($v == 'summary') { /* Summary */ $serendipity['short_archives'] = true; - unset($args[1][$k]); + unset($_args[$k]); + } elseif ($v{0} == 'P') { /* Page */ + $serendipity['GET']['page'] = substr($v, 1); + unset($_args[$k]); + unset($serendipity['uriArguments'][$k]); } } /* We must always *assume* that Year, Month and Day are the first 3 arguments */ - list($year, $month, $day) = $args[1]; + list(,$year, $month, $day) = $_args; $_GET['serendipity']['action'] = 'read'; $_GET['serendipity']['hidefooter'] = true; + if ( !isset($year) ) { + $year = date('Y'); + $month = date('m'); + $day = date('j'); + $_GET['serendipity']['action'] = null; + $_GET['serendipity']['hidefooter'] = null; + } + if ($week) { $tm = strtotime('+ '. ($week-2) .' WEEKS monday', mktime(0, 0, 0, 1, 1, $year)); $ts = mktime(0, 0, 0, date('m', $tm), date('j', $tm), $year); @@ -189,17 +214,31 @@ serendipity_plugin_api::hook_event('external_plugin', $matches[1]); exit; } else if (preg_match(PAT_CATEGORIES, $uri, $matches)) { - $serendipity['GET']['category'] = $matches[1]; - $serendipity['GET']['action'] = 'read'; - $cInfo = serendipity_fetchCategoryInfo($serendipity['GET']['category']); - $serendipity['head_title'] = $cInfo['category_name']; - $serendipity['head_subtitle'] = $serendipity['blogTitle']; + $_args = $serendipity['uriArguments']; - include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); + /* Attempt to locate hidden variables within the URI */ + foreach ($_args as $k => $v){ + if ($v == PATH_CATEGORIES) { + continue; + } + if ($v{0} == 'P') { /* Page */ + $serendipity['GET']['page'] = substr($v, 1); + unset($_args[$k]); + unset($serendipity['uriArguments'][$k]); + } + } + + $serendipity['GET']['category'] = $matches[1]; + $serendipity['GET']['action'] = 'read'; + $cInfo = serendipity_fetchCategoryInfo($serendipity['GET']['category']); + $serendipity['head_title'] = $cInfo['category_name']; + $serendipity['head_subtitle'] = $serendipity['blogTitle']; + + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); } else if (preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) || preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) { - - include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); + $serendipity['uriArguments'][] = PATH_ARCHIVES; + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); } else { header('HTTP/1.0 404 Not found'); include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); |
|
From: Evan N. <tad...@us...> - 2004-12-12 05:37:20
|
Update of /cvsroot/php-blog/serendipity/templates/wp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18506 Modified Files: commentform.tpl Log Message: Get comments + captchas to work. Thanks to Tom for bringing it up. Index: commentform.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/wp/commentform.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- commentform.tpl 11 Dec 2004 20:47:43 -0000 1.1 +++ commentform.tpl 12 Dec 2004 05:37:10 -0000 1.2 @@ -1,10 +1,12 @@ <p> <p><a href='{$serendipityBaseURL}/rss.php?version=2.0&type=comments&cid={$commentform_id}'><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p> <h2 id="postcomment">Leave a comment</h2> - <p>{serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}</p> <form action="{$commentform_action}#feedback" method="post" id="commentform"> <p> + {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} + </p> + <p> <input id="name" type="text" name="serendipity[name]" value="{$commentform_name}" size="28" tabindex="1" /> <label for="author">{$CONST.NAME}</label> </p> |
|
From: Evan N. <tad...@us...> - 2004-12-11 22:10:20
|
Update of /cvsroot/php-blog/serendipity/templates/wp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5341 Modified Files: wp-layout.css Log Message: Absolute paths work on /my/ server... ;) Index: wp-layout.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/wp/wp-layout.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- wp-layout.css 11 Dec 2004 20:47:43 -0000 1.1 +++ wp-layout.css 11 Dec 2004 22:10:10 -0000 1.2 @@ -76,7 +76,7 @@ margin: auto; width: 100%; padding: 1em; - background-image: url(/en/templates/default/img/background.png); + background-image: url(../default/img/background.png); border-bottom: 1px solid #000000; } |
|
From: Evan N. <tad...@us...> - 2004-12-11 20:50:43
|
Update of /cvsroot/php-blog/serendipity/templates/wp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22947 Removed Files: style.css Log Message: WP default CSS is not supposed to be here. Sorry about that. --- style.css DELETED --- |
|
From: Evan N. <tad...@us...> - 2004-12-11 20:47:53
|
Update of /cvsroot/php-blog/serendipity/templates/wp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22356 Added Files: atom.css commentform.tpl comments.tpl content.tpl entries_archives.tpl entries_summary.tpl entries.tpl htmlarea.css index.tpl info.txt plugin_calendar.tpl sidebar.tpl style.css trackbacks.tpl wp-layout.css Log Message: Add WP-Compat template. --- NEW FILE: entries_archives.tpl --- {foreach from=$archives item="archive"} <table cellspacing="4" cellpadding="4" border="0"> <tr> <td colspan="4"><h2>{$archive.year}</h2></td> </tr> {foreach from=$archive.months item="month"} <tr> <td width="100"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000"></td> <td>{$month.date|@formatTime:"%B"}</td> <td>{$month.entry_count} {$CONST.ENTRIES}</td> <td>({if $month.entry_count}<a href="{$month.link}">{/if}{$CONST.VIEW_FULL}{if $month.entry_count}</a>{/if})</td> <td>({if $month.entry_count}<a href="{$month.link_summary}">{/if}{$CONST.VIEW_TOPICS}{if $month.entry_count}</a>{/if})</td> </tr> {/foreach} </table> {/foreach} --- NEW FILE: htmlarea.css --- body { font-size: 10pt; padding: 10px; color: #333333; background-color: #FAFFFF; font-size: 9.5pt; font-weight: normal; font-family: verdana, arial, geneva, helvetica, sans-serif; } /** Embedded images with the s9y image manager **/ .serendipity_imageComment_center, .serendipity_imageComment_left, .serendipity_imageComment_right { border: 1px solid black; background-color: #EFEFEF; margin: 3px; } .serendipity_imageComment_center { } .serendipity_imageComment_left { float: left; } .serendipity_imageComment_right { float: right; } .serendipity_imageComment_img, .serendipity_imageComment_img img { margin: 0px; padding: 0px; border: 0px; } .serendipity_imageComment_txt { margin: 0px; padding: 3px; clear: both; font-size: 9pt; } --- NEW FILE: commentform.tpl --- <p> <p><a href='{$serendipityBaseURL}/rss.php?version=2.0&type=comments&cid={$commentform_id}'><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p> <h2 id="postcomment">Leave a comment</h2> <p>{serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}</p> <form action="{$commentform_action}#feedback" method="post" id="commentform"> <p> <input id="name" type="text" name="serendipity[name]" value="{$commentform_name}" size="28" tabindex="1" /> <label for="author">{$CONST.NAME}</label> </p> <p> <input type="text" id="email" name="serendipity[email]" value="{$commentform_email}" size="28" tabindex="2" /> <label for="email">{$CONST.EMAIL}</label> </p> <p> <input id="url" type="text" name="serendipity[url]" value="{$commentform_url}" size="28" tabindex="3" /> <label for="url">{$CONST.HOMEPAGE}</label> </p> <p> <label for="comment">{$CONST.COMMENT}</label><br /> <textarea id="comment" rows="4" cols="40" name="serendipity[comment]">{$commentform_data}</textarea> </p> {if $is_commentform_showToolbar} <p> <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" {$commentform_remember} /> <label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label> </p> {if $is_allowSubscriptions} <p> <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /> <label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> </p> {/if} {/if} {if $is_moderate_comments} <p>{$CONST.COMMENTS_WILL_BE_MODERATED}</p> {/if} <p> <input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}" /> <input type="submit" name="serendipity[submit]" value="{$CONST.SUBMIT_COMMENT}" /> <input type="submit" name="serendipity[preview]" value="{$CONST.PREVIEW}" /> </p> </form> </p> --- NEW FILE: wp-layout.css --- /* Serendipity WP default By Evan Nemerson December 11, 2004 This is just a simple template modeled after the default one. It is meant mostly as something to collect dust while you use a custom WP theme, but it can also be used to guide you in creating your own. It is licensed under the BSD license, like the rest of Serendipity, and unlike most WP themes (which are GPL). */ #content { border-right: 1px dashed #000000; border-bottom: 1px solid #000000; border-top: 0px; background-color: #FFFFFF; position: absolute; margin-right: 16em; } #menu { vertical-align: top; background: white; width: 16em; position: absolute; right: 0; } #content > * { padding: 10px; margin: 10px; width: auto; } #menu > ul { display: block; list-style: none; padding-left: 0; margin: 1em; } #menu > ul > li { font-size: 1.2em; font-weight: bold; margin-bottom: 1em; padding-bottom: 1em; border-bottom: solid 2px #36558C; } #menu > ul > li > * { font-size: 0.83em; font-weight: normal; } body { font-size: 10pt; margin: 0; font-size: 10px; font-family: verdana, arial, helvetica, sans-serif; margin-bottom: 30px; } input, textarea { font-size: 10pt; font-family: verdana, arial, helvetica, sans-serif; } th, td { font-size: 10pt; } p, td, th, div, span { font-family: verdana, arial, helvetica, sans-serif; } #header { margin: auto; width: 100%; padding: 1em; background-image: url(/en/templates/default/img/background.png); border-bottom: 1px solid #000000; } #header a, #header a:hover, #header a:link, #header a:visited { color: #FFFFFF; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; text-decoration: none; } h2 { font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; font-size: large; color: #333333; margin: 0; margin-top: 20px; text-align: right; } .storytitle { font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; font-size: medium; font-weight: bold; margin-top: 1em; color: #333333; border-bottom: 2px solid #36558C; } .storytitle a:link, .storytitle a:visited { text-decoration: none; border: 0; color: #000000; } .meta > ul > li, ul.post-meta li { display: inline; } .meta > ul { display: inline; list-style: none; margin: 0; padding: 0; } .storytitle { margin: auto; } .storytitle a:hover { color: #FF0000; } .storycontent { font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; color: #333333; font-size: 1.3em; font-weight: normal; padding-right: 10px; width: 95%; margin: auto; margin-top: 1em; } --- NEW FILE: entries.tpl --- {serendipity_hookPlugin hook="entries_header" addData="$entry_id"} {foreach from=$entries item="dategroup"} {if $dategroup.is_sticky} <h2>{$CONST.STICKY_POSTINGS}</h2> {else} <h2>{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}</h2> {/if} {foreach from=$dategroup.entries item="entry"} <div class="post"> <h3 class="storytitle" id="post-{$entry.id}"><a href="{$entry.link}" rel="bookmark" title="Permanent Link: {$entry.title}">{$entry.title}</a></h3> <div class="meta">Filed under: <ul class="post-categories">{foreach from=$entry.categories item="category"} <li><a title="View all posts in {$category.category_name}" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.category_id}-{$category.category_name|@makeFilename}">{$category.category_name}</a></li> {/foreach}</ul> — {$entry.username} @ {$entry.timestamp|@formatTime:'%I:%M %p'} </div> <div class="storycontent"> <p> {$entry.body} {if $entry.is_extended} {$entry.extended} {/if} </p> {if $entry.has_extended and not $is_single_entry and not $entry.is_extended} <p><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a></p> {/if} </div> <div class="feedback"> <a href="{$entry.link}#comments">Comments ({$entry.comments+$entry.trackbacks})</a> {$entry.add_footer} </div> <!-- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rdf:Description rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$entry.id}.rdf" trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&entry_id={$entry.id}" dc:title="{$entry.title}" dc:identifier="{$entry.rdf_ident}" /> </rdf:RDF> --> {$entry.plugin_display_dat} {if $is_single_entry and not $is_preview} <h2 id="comments">Comments <a href="#postcomment" title="Leave a comment">»</a></h2> <p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em>{$serendipityBaseURL}comment.php?type=trackback&entry_id={$entry.id}</em></p> <ol id="commentlist"> {serendipity_printTrackbacks entry=$entry.id} {serendipity_printComments entry=$entry.id mode=$CONST.VIEWMODE_LINEAR} </ol> {$COMMENTFORM} {/if} </div> {/foreach} {foreachelse} {if not $plugin_clean_page} {$CONST.NO_ENTRIES_TO_PRINT} {/if} {/foreach} --- NEW FILE: content.tpl --- <!-- CONTENT START --> {$content_message} {$ENTRIES} {$ARCHIVES} <!-- CONTENT END --> --- NEW FILE: plugin_calendar.tpl --- <table id="wp-calendar"> <caption>November 2004</caption> <thead> <tr> <th abbr="Sunday" scope="col" title="Sunday">S</th> <th abbr="Monday" scope="col" title="Monday">M</th> <th abbr="Tuesday" scope="col" title="Tuesday">T</th> <th abbr="Wednesday" scope="col" title="Wednesday">W</th> <th abbr="Thursday" scope="col" title="Thursday">T</th> <th abbr="Friday" scope="col" title="Friday">F</th> <th abbr="Saturday" scope="col" title="Saturday">S</th> </tr> </thead> <tfoot> <tr> <td colspan="3" id="prev">{if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}<a href="{$plugin_calendar_head.uri_previous}" title="View posts for previous month">«</a>{/if}</td> <td class="pad"> </td> <td colspan="3" id="next">{if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}<a href="{$plugin_calendar_head.uri_next}" title="View posts for previous month">»</a>{/if}</td> </tr> </tfoot> <tbody> {foreach from=$plugin_calendar_weeks item="week"} <tr> {foreach from=$week.days item="day"} <td>{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td> {/foreach} </tr> {/foreach} </tbody> </table> --- NEW FILE: comments.tpl --- {foreach from=$comments item=comment} <li id="comment-{$comment.id}"> <p><strong></strong>{$comment.body}</p> <p><cite>Comment by {if $comment.url}<a href="{$comment.url}" rel='external'>{$comment.username|@default:$CONST.ANONYMOUS}</a>{else}{$comment.username|@default:$CONST.ANONYMOUS}{/if} — {$comment.timestamp|@formatTime:'%m/%d/%Y'} @ <a href="#comment-{$comment.id}">{$comment.timestamp|@formatTime:'%I:%M %p'}</a></cite></p> </li> {/foreach} --- NEW FILE: style.css --- /* Default WordPress by Dave Shea || http://mezzoblue.com Modifications by Matthew Mullenweg || http://photomatt.net This is just a basic layout, with only the bare minimum defined. Please tweak this and make it your own. :) */ a { color: #675; } a img { border: none; } a:visited { color: #342; } a:hover { color: #9a8; } acronym, abbr { border-bottom: 1px dashed #333; } acronym, abbr, span.caps { cursor: help; font-size: 90%; letter-spacing: .07em; } blockquote { border-left: 5px solid #ccc; margin-left: 1.5em; padding-left: 5px; } body { background: #fff; border: solid 2px #565; border-bottom: solid 1px #565; border-top: solid 3px #565; color: #000; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; margin: 0; padding: 0; } cite { font-size: 90%; font-style: normal; } h2 { border-bottom: 1px dotted #ccc; font: 95% "Times New Roman", Times, serif; letter-spacing: 0.2em; margin: 15px 0 2px 0; padding-bottom: 2px; } h3 { border-bottom: dotted 1px #eee; font-family: "Times New Roman", Times, serif; margin-top: 0; } ol#comments li p { font-size: 100%; } p, li, .feedback { font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; letter-spacing: -1px; } /* classes used by the_meta() */ ul.post-meta { list-style: none; } ul.post-meta span.post-meta-key { font-weight: bold; } .credit { background: #90a090; border-top: double 3px #aba; color: #fff; font-size: 11px; margin: 10px 0 0 0; padding: 3px; text-align: center; } .credit a:link, .credit a:hover { color: #fff; } .feedback { color: #ccc; text-align: right; clear: all; } .meta { font-size: .75em; } .meta li, ul.post-meta li { display: inline; } .meta ul { display: inline; list-style: none; margin: 0; padding: 0; } .meta, .meta a { color: #808080; font-weight: normal; letter-spacing: 0; } .storytitle { margin: 0; } .storytitle a { text-decoration: none; } #commentform #name, #commentform #email, #commentform #url, #commentform textarea { background: #fff; border: 1px solid #333; padding: .2em; } #commentform textarea { width: 100%; } #commentlist li ul { border-left: 1px solid #ddd; font-size: 110%; list-style-type: none; } #content { margin: 30px 13em 0 3em; padding-right: 60px; } #header { background: #90a090; border-bottom: double 3px #aba; border-left: solid 1px #9a9; border-right: solid 1px #565; border-top: solid 1px #9a9; font: italic normal 230% 'Times New Roman', Times, serif; letter-spacing: 0.2em; margin: 0; padding: 15px 10px 15px 60px; } #header a { color: #fff; text-decoration: none; } #header a:hover { text-decoration: underline; } #menu { background: #fff; border-left: 1px dotted #ccc; border-top: solid 3px #e0e6e0; padding: 20px 0 10px 30px; position: absolute; right: 2px; top: 0; width: 11em; } #menu form { margin: 0 0 0 13px; } #menu input#s { width: 80%; background: #eee; border: 1px solid #999; color: #000; } #menu ul { color: #ccc; font-weight: bold; list-style-type: none; margin: 0; padding-left: 3px; text-transform: lowercase; } #menu ul li { font: italic normal 110% 'Times New Roman', Times, serif; letter-spacing: 0.1em; margin-top: 10px; padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/ } #menu ul ul { font-variant: normal; font-weight: normal; line-height: 100%; list-style-type: none; margin: 0; padding: 0; text-align: left; } #menu ul ul li { border: 0; font: normal normal 70%/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; letter-spacing: 0; margin-top: 0; padding: 0; padding-left: 12px; } #menu ul ul li a { color: #000; text-decoration: none; } #menu ul ul li a:hover { border-bottom: 1px solid #809080; } #menu ul ul ul.children { font-size: 142%; padding-left: 4px; } #wp-calendar { border: 1px solid #ddd; empty-cells: show; font-size: 14px; margin: 0; width: 90%; } #wp-calendar #next a { padding-right: 10px; text-align: right; } #wp-calendar #prev a { padding-left: 10px; text-align: left; } #wp-calendar a { display: block; text-decoration: none; } #wp-calendar a:hover { background: #e0e6e0; color: #333; } #wp-calendar caption { color: #999; font-size: 16px; text-align: left; } #wp-calendar td { color: #ccc; font: normal 12px 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; letter-spacing: normal; padding: 2px 0; text-align: center; } #wp-calendar td.pad:hover { background: #fff; } #wp-calendar td:hover, #wp-calendar #today { background: #eee; color: #bbb; } #wp-calendar th { font-style: normal; text-transform: capitalize; } --- NEW FILE: info.txt --- Name: WP-compat Author: Evan Nemerson Date: 20/11-2004 --- NEW FILE: index.tpl --- {if $is_embedded != true} <!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"> <head> <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="generator" content="Serendipity v.{$head_version}" /> <style type="text/css" media="screen"> @import url( {serendipity_getFile file="wp-layout.css"} ); </style> {serendipity_hookPlugin hook="frontend_header"} </head> <body> {/if} {if $is_raw_mode != true} <div id="rap"> <h1 id="header"><a href="{$serendipityBaseURL}" title="{$head_title|@default:$blogTitle}: {$head_subtitle|@default:$blogDescription}">{$head_title|@default:$blogTitle}</a></h1> <div id="content"> {$CONTENT} </div> {/if} {$raw_data} {if $leftSidebarElements or $rightSidebarElements} <div id="menu"> <ul> {if $leftSidebarElements}{serendipity_printSidebar side="left"}{/if} {if $rightSidebarElements}{serendipity_printSidebar side="right"}{/if} </ul> </div> {/if} </div> <p class="credit"><cite>Powered by <a href="http://www.s9y.org/" title="Powered by Serendipity PHP Weblog"><strong>Serendipity</strong></a></cite></p> {if $is_embedded != true} </body> </html> {/if} --- NEW FILE: atom.css --- /* Basic CSS taken from http://www.blogger.com/styles/atom.css */ feed { display:block; font-family:verdana, sans-serif; margin:2%; font-size:90%; color:#000000; background:#ffffff; } title { display:block; font-size:1.3em; color:inherit; background:inherit; font-weight:bold; } tagline, link { display:block; font-size:0.9em; } id, modified { display:none; } generator { display:block; font-size:0.9em; } info { display:block; margin:3em 4em 3em 4em; color:#CC3333; background:#FFFF66; border:solid #CCCC66 2px; text-align:center; padding:1.5em; font-family:mono; font-size:0.8em; } entry { display:block; color:inherit; background:inherit; padding:0; margin:1em 1em 4em 1em; } entry modified, entry name { display:inline; color:#999999; background:inherit; font-size:0.8em; } entry created, entry issued, entry id { display:none; } /* Using a single 'commentRSS' and 'comments' is used for compatibility to Opera */ slash\:comments, wfw\:commentRss, commentRss, comments, wfw\:comment, comment { display:none; } entry title { display:block; font-size:1em; font-weight:bold; color:inherit; background:inherit; padding:1em 1em 0em 1em; margin:0; border-top:solid 1px #dddddd; } content { display:block; font-size:0.9em; color:inherit; background:inherit; padding:1em; line-height:1.5em; } --- NEW FILE: trackbacks.tpl --- {foreach from=$trackbacks item=trackback} <li id="trackback-{$trackback.id}"> <p><strong>{$trackback.title}</strong><br />{$trackback.body|@strip_tags|@escape:all}</p> <p><cite>Trackback by <a href='{$trackback.url|@strip_tags}' rel='external'>{$trackback.author|@default:$CONST.ANONYMOUS}</a> — {$trackback.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT} @ <a href="#trackback-{$trackback.id}">{$trackback.timestamp|@formatTime:'%g:%M %a'}</a></cite> </p> </li> {/foreach} --- NEW FILE: entries_summary.tpl --- <div class='serendipity_date'>{$CONST.TOPICS_OF} {$entries.entries.date|@formatTime:"%B, %Y"}</div> <div class="serendipity_entry"> {foreach from=$entries item="entries"} <ul> {foreach from=$entries.entries item="entry"} <li><a href="{$entry.link}">{$entry.title}</a> <br />{$CONST.POSTED_BY} {$entry.username} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li> {/foreach} </ul> {/foreach} </div> --- NEW FILE: sidebar.tpl --- {foreach from=$plugindata item=item} <li id="{$item.class}">{$item.title} {$item.content} </li> {/foreach} |
|
From: Evan N. <tad...@us...> - 2004-12-11 20:45:13
|
Update of /cvsroot/php-blog/serendipity/templates/wp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21877/wp Log Message: Directory /cvsroot/php-blog/serendipity/templates/wp added to the repository |
|
From: Evan N. <tad...@us...> - 2004-12-11 17:28:48
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12677/include Modified Files: functions_config.inc.php Log Message: Add possibility of using template engines. Index: functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- functions_config.inc.php 11 Dec 2004 14:39:43 -0000 1.9 +++ functions_config.inc.php 11 Dec 2004 17:28:06 -0000 1.10 @@ -98,11 +98,14 @@ function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') { global $serendipity; - $directories = array( - (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''), - $serendipity['defaultTemplate'] .'/', - 'default/' - ); + $directories = array(); + + $directories[] = isset($serendipity['template']) ? $serendipity['template'] . '/' : ''; + if ( isset($serendipity['template_engine']) ) { + $directories[] = $serendipity['template_engine'] . '/'; + } + $directories[] = $serendipity['defaultTemplate'] .'/'; + $directories[] = 'default/'; foreach ($directories as $directory) { $templateFile = $serendipity['templatePath'] . $directory . $file; |
