|
From: Tom S. <tom...@us...> - 2004-11-27 22:15:04
|
Update of /cvsroot/php-blog/serendipity/include/tpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/include/tpl Modified Files: htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: htaccess_rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- htaccess_rewrite.tpl 19 Nov 2004 11:05:34 -0000 1.2 +++ htaccess_rewrite.tpl 27 Nov 2004 22:14:16 -0000 1.3 @@ -13,8 +13,7 @@ RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA] -RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] -RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] +RewriteRule ^{PAT_ADMIN} {indexFile}?url=admin/ [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 Index: htaccess_cgi_rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- htaccess_cgi_rewrite.tpl 19 Nov 2004 11:05:34 -0000 1.2 +++ htaccess_cgi_rewrite.tpl 27 Nov 2004 22:14:16 -0000 1.3 @@ -11,8 +11,7 @@ RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA] -RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] -RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] +RewriteRule ^{PAT_ADMIN} {indexFile}?url=admin/ [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 |
