From: Carsten K. <car...@us...> - 2002-01-03 00:09:21
|
Update of /cvsroot/phpwiki/phpwiki/templates In directory usw-pr-cvs1:/tmp/cvs-serv25833 Modified Files: browse.html editpage.html message.html Log Message: CSS now stored in an array, and <link rel="stylesheet"> headers are dynamically generated. - Simplifies xhtml templates. - Easier to add new alternate stylesheets in index.php without using themes. - Any stylesheets defined by a theme now works together with any default stylesheets (i.e. phpwiki.css, phpwiki-printer.css, phpwiki-modern.css) instead of completely replacing them. Index: browse.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** browse.html 2002/01/02 06:35:01 1.36 --- browse.html 2002/01/03 00:09:18 1.37 *************** *** 15,25 **** <!-- <meta name="robots" content="index,follow" /> --> <base href="${BASE_URL}" /> <title>${WIKI_NAME}: ${SPLIT_PAGE}</title> <!-- --> - <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> - <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" /> - </head> <body> --- 15,23 ---- <!-- <meta name="robots" content="index,follow" /> --> <base href="${BASE_URL}" /> + ${CSS} <title>${WIKI_NAME}: ${SPLIT_PAGE}</title> <!-- --> </head> <body> Index: editpage.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** editpage.html 2001/12/30 06:10:55 1.35 --- editpage.html 2002/01/03 00:09:18 1.36 *************** *** 11,17 **** <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" /> <meta name="robots" content="noindex,nofollow" /> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> ! <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" /> ! <title>${WIKI_NAME} - <?php printf(_("Edit: %s"),"${SPLIT_PAGE}"); ?></title> </head> --- 11,15 ---- <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" /> <meta name="robots" content="noindex,nofollow" /> ! ${CSS} <title>${WIKI_NAME} - <?php printf(_("Edit: %s"),"${SPLIT_PAGE}"); ?></title> </head> Index: message.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** message.html 2001/12/30 06:11:00 1.19 --- message.html 2002/01/03 00:09:18 1.20 *************** *** 11,17 **** <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" /> <meta name="robots" content="noindex,nofollow" /> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> ! <link rel="alternate stylesheet" title="printer" href="${BASE_URL}phpwiki-printer.css" type="text/css" /> ! <title>${WIKI_NAME}: ${TITLE}</title> </head> --- 11,15 ---- <meta http-equiv="Content-Type" content="text/html; charset=${CHARSET}" /> <meta name="robots" content="noindex,nofollow" /> ! ${CSS} <title>${WIKI_NAME}: ${TITLE}</title> </head> |