OSDN Git Service

sync with v3.24
authorkimitake <kimitake@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Wed, 31 Jan 2007 10:02:59 +0000 (10:02 +0000)
committerkimitake <kimitake@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Wed, 31 Jan 2007 10:02:59 +0000 (10:02 +0000)
still working.

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@178 1ca29b6e-896d-4ea0-84a5-967f57386b96

16 files changed:
utf8/nucleus/documentation/index.html
utf8/nucleus/libs/ACTION.php
utf8/nucleus/libs/ADMIN.php
utf8/nucleus/libs/globalfunctions.php
utf8/nucleus/libs/xmlrpcs.inc.php
utf8/nucleus/plugins/skinfiles/index.php
utf8/nucleus/upgrades/upgrade3.2.php
utf8/skins/atom/skinbackup.xml
utf8/skins/default/default_left.css
utf8/skins/default/default_right.css
utf8/skins/default/head.inc
utf8/skins/default/navigation.inc
utf8/skins/default/sidebar.inc
utf8/skins/default/skinbackup.xml
utf8/skins/rsd/skinbackup.xml
utf8/skins/rss2.0/skinbackup.xml

index 17b6c8d..9944182 100755 (executable)
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja-JP" xml:lang="ja-JP">
 <head>
-       <!-- $Id: index.html,v 1.6 2006-07-17 20:02:50 kimitake Exp $ -->
-       <!-- $NucleusJP: index.html,v 1.5 2006/07/12 07:11:46 kimitake Exp $ -->
+       <!-- $Id: index.html,v 1.7 2007-01-31 10:02:57 kimitake Exp $ -->
+       <!-- $NucleusJP: index.html,v 1.6 2006/07/17 20:02:50 kimitake Exp $ -->
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
        <title>Nucleus CMS マニュアル</title>
        <link rel="stylesheet" type="text/css" href="styles/manual.css" />
@@ -97,7 +97,7 @@ Nucleus はサイト構築にあたって痒いところに手が届くように
 <p>
 Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 <br />
-Copyright (C) 2002-2006 The Nucleus Group
+Copyright (C) 2002-2007 The Nucleus Group
 </p>
 
 <p>このプログラムはフリーウェアです。フリーソフトウェア財団(the Free Software Foundation)が公表したGNU一般公共使用許諾(GNU General Public License)の「バージョン2」或いはそれ以降の各バージョンの中からいずれかを選択し、そのバージョンが定める条項に従ったうえで、本プログラムの再配布・改変を認めています。
index 13724a8..d9ad776 100755 (executable)
@@ -15,8 +15,8 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
- * @version $Id: ACTION.php,v 1.5 2006-07-17 20:03:44 kimitake Exp $
- * $NucleusJP: ACTION.php,v 1.4 2006/07/12 07:11:47 kimitake Exp $
+ * @version $Id: ACTION.php,v 1.6 2007-01-31 10:02:58 kimitake Exp $
+ * $NucleusJP: ACTION.php,v 1.5 2006/07/17 20:03:44 kimitake Exp $
  */
 class ACTION
 {
@@ -231,6 +231,7 @@ class ACTION
                if (postVar('url')) {
                        redirect(postVar('url'));
                } else {
+                       header ("Content-Type: text/html; charset="._CHARSET);
                        echo _MSG_ACTIVATION_SENT;
                }
 
index f7c28f4..e784017 100755 (executable)
@@ -14,8 +14,8 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
- * @version $Id: ADMIN.php,v 1.11 2006-11-13 00:43:07 kimitake Exp $
- * @version $NucleusJP: ADMIN.php,v 1.10 2006/11/13 00:36:39 kimitake Exp $
+ * @version $Id: ADMIN.php,v 1.12 2007-01-31 10:02:58 kimitake Exp $
+ * @version $NucleusJP: ADMIN.php,v 1.11 2006/11/13 00:43:07 kimitake Exp $
  */
 
 require_once "showlist.php";
@@ -4975,10 +4975,17 @@ selector();
 
                        echo '<br />(';
 
+                       // Note(JP): disabled code name description
+/*
                        if ($member->isLoggedIn() && $member->isAdmin())
                                echo '<a href="http://nucleuscms.org/version.php?v=',getNucleusVersion(),'&amp;pl=',getNucleusPatchLevel(),'" title="Check for upgrade">Nucleus CMS ', $nucleus['version'], ' &quot;', $nucleus['codename'], '&quot;</a>';
                        else
                                echo 'Nucleus CMS ', $nucleus['version'], ' &quot;', $nucleus['codename'], '&quot;';
+*/
+                       if ($member->isLoggedIn() && $member->isAdmin())
+                               echo '<a href="http://nucleuscms.org/version.php?v=',getNucleusVersion(),'&amp;pl=',getNucleusPatchLevel(),'" title="Check for upgrade">Nucleus CMS ', $nucleus['version'], ' </a>';
+                       else
+                               echo 'Nucleus CMS ', $nucleus['version'];
                        echo ')';
                echo '</div>';
        }
@@ -5130,13 +5137,16 @@ selector();
                // header-code stolen from phpMyAdmin
                // REGEDIT and bookmarklet code stolen from GreyMatter
 
+               $sjisBlogName = getBlogNameFromID($blogid);
+               $sjisBlogName = mb_convert_encoding($sjisBlogName, "SJIS", "auto");
+
                header('Content-Type: application/octetstream');
                header('Content-Disposition: filename="nucleus.reg"');
                header('Pragma: no-cache');
                header('Expires: 0');
 
                echo "REGEDIT4\n";
-               echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\Post To &Nucleus (".getBlogNameFromID($blogid).")]\n";
+               echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\Post To &Nucleus (".$sjisBlogName.")]\n";
                echo '@="' . $CONF['AdminURL'] . "bookmarklet.php?action=contextmenucode&blogid=".intval($blogid)."\"\n";
                echo '"contexts"=hex:31';
        }
index abdaa3b..52a8504 100755 (executable)
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
-* @version $Id: globalfunctions.php,v 1.9 2006-08-31 21:00:21 kimitake Exp $
- * $NucleusJP: globalfunctions.php,v 1.8 2006/07/18 08:42:04 kimitake Exp $
+* @version $Id: globalfunctions.php,v 1.10 2007-01-31 10:02:58 kimitake Exp $
+ * $NucleusJP: globalfunctions.php,v 1.9 2006/08/31 21:00:21 kimitake Exp $
  */
 
 // needed if we include globalfunctions from install.php
 global $nucleus, $CONF, $DIR_LIBS, $DIR_LANG, $manager, $member;
 
-$nucleus['version'] = 'v3.3SVN';
-$nucleus['codename'] = 'Lithium';
+//$nucleus['version'] = 'v3.3SVN';
+//$nucleus['codename'] = 'Lithium';
+$nucleus['version'] = 'v3.3';
+$nucleus['codename'] = '';
 
 checkVars(array('nucleus', 'CONF', 'DIR_LIBS', 'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE', 'DIR_LANG', 'DIR_PLUGINS', 'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS', 'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS', 'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));
 
@@ -85,6 +87,13 @@ if ($CONF['installscript'] != 1) { // vars were already included in install.php
        }
 }
 
+// sanitize option
+$bLoggingSanitizedResult=0;
+$bSanitizeAndContinue=0;
+
+$orgRequestURI = serverVar('REQUEST_URI');
+sanitizeParams();
+
 // get all variables that can come from the request and put them in the global scope
 $blogid        = requestVar('blogid');
 $itemid        = intRequestVar('itemid');
@@ -136,6 +145,18 @@ if ($CONF['UsingAdminArea']) {
 sql_connect();
 $SQLCount = 0;
 
+// logs sanitized result if need
+if ($orgRequestURI!==serverVar('REQUEST_URI')) {
+       $msg = "Sanitized [" . serverVar('REMOTE_ADDR') . "] ";
+       $msg .= $orgRequestURI . " -> " . serverVar('REQUEST_URI');
+    if ($bLoggingSanitizedResult) {
+        addToLog(WARNING, $msg);
+    }
+    if (!$bSanitizeAndContinue) {
+        die("");
+    }
+}
+
 // makes sure database connection gets closed on script termination
 register_shutdown_function('sql_disconnect');
 
@@ -480,7 +501,8 @@ function sendContentType($contenttype, $pagetype = '', $charset = _CHARSET) {
 function startUpError($msg, $title) {
        ?>
        <html xmlns="http://www.w3.org/1999/xhtml">
-               <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title><?php echo htmlspecialchars($title)?></title></head>
+               <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+               <title><?php echo htmlspecialchars($title)?></title></head>
                <body>
                        <h1><?php echo htmlspecialchars($title)?></h1>
                        <?php echo $msg?>
@@ -1400,6 +1422,171 @@ function checkVars($aVars) {
        }
 }
 
+
+/** 
+ * Sanitize parameters such as $_GET and $_SERVER['REQUEST_URI'] etc.
+ * to avoid XSS 
+ */
+function sanitizeParams()
+{
+       global $HTTP_SERVER_VARS;
+       
+       $array = array();
+       $str = '';
+       $frontParam = '';
+       
+       // REQUEST_URI of $HTTP_SERVER_VARS
+       $str =& $HTTP_SERVER_VARS["REQUEST_URI"];
+       serverStringToArray($str, $array, $frontParam);
+       sanitizeArray($array);
+       arrayToServerString($array, $frontParam, $str);
+       
+       // QUERY_STRING of $HTTP_SERVER_VARS
+       $str =& $HTTP_SERVER_VARS["QUERY_STRING"];
+       serverStringToArray($str, $array, $frontParam);
+       sanitizeArray($array);
+       arrayToServerString($array, $frontParam, $str);
+       
+       if (phpversion() >= '4.1.0') {
+               // REQUEST_URI of $_SERVER
+               $str =& $_SERVER["REQUEST_URI"];
+               serverStringToArray($str, $array, $frontParam);
+               sanitizeArray($array);
+               arrayToServerString($array, $frontParam, $str);
+       
+               // QUERY_STRING of $_SERVER
+               $str =& $_SERVER["QUERY_STRING"];
+               serverStringToArray($str, $array, $frontParam);
+               sanitizeArray($array);
+               arrayToServerString($array, $frontParam, $str);
+       }
+       
+       // $_GET
+       convArrayForSanitizing($_GET, $array);
+       sanitizeArray($array);
+       revertArrayForSanitizing($array, $_GET);
+       
+       // $_REQUEST (only GET param)
+       convArrayForSanitizing($_REQUEST, $array);
+       sanitizeArray($array);
+       revertArrayForSanitizing($array, $_REQUEST);
+}
+
+/** 
+ * Convert the server string such as $_SERVER['REQUEST_URI']
+ * to arry like arry['blogid']=1 and array['page']=2 etc.
+ */
+function serverStringToArray($str, &$array, &$frontParam)
+{
+       // init param
+       $array = array();
+       $fronParam = "";
+
+       // split front param, e.g. /index.php, and others, e.g. blogid=1&page=2
+       if (strstr($str, "?")){
+               list($frontParam, $args) = preg_split("/\?/", $str, 2);
+       }
+       else {
+               $args = $str;
+               $frontParam = "";
+       }
+       
+       // If there is no args like blogid=1&page=2, return
+       if (!strstr($str, "=") && !strlen($frontParam)) {
+               $frontParam = $str;
+               return;
+       }
+
+       $array = explode("&", $args);
+}
+
+/** 
+ * Convert array like array['blogid'] to server string
+ * such as $_SERVER['REQUEST_URI']
+ */
+function arrayToServerString($array, $frontParam, &$str)
+{
+       if (strstr($str, "?")) {
+               $str = $frontParam . "?";
+       } else {
+               $str = $frontParam;
+       }
+       if (count($array)) {
+               $str .= implode("&", $array);
+       }
+}
+
+/** 
+ * Sanitize array parameters.
+ * This function checks both key and value.
+ * - check key if it inclues " (double quote),  remove from array
+ * - check value if it includes \ (escape sequece), remove remaining string
+ */
+function sanitizeArray(&$array)
+{      
+       $excludeListForSanitization = array('query');
+//     $excludeListForSanitization = array();
+
+       foreach ($array as $k => $v) {
+
+               // split to key and value
+               list($key, $val) = preg_split("/=/", $v, 2);
+               if (!isset($val)) {
+                       continue;
+               }
+
+               // when magic quotes is on, need to use stripslashes,
+               // and then addslashes
+               if (get_magic_quotes_gpc()) {
+                       $val = stripslashes($val);
+               }
+               $val = addslashes($val);
+               
+               // if $key is included in exclude list, skip this param
+               if (!in_array($key, $excludeListForSanitization)) {
+                               
+                       // check value
+                       list($val, $tmp) = explode('\\', $val);
+                       
+                       // remove control code etc.
+                       $val = strtr($val, "\0\r\n<>'\"", "       ");
+                               
+                       // check key
+                       if (preg_match('/\"/i', $key)) {
+                               unset($array[$k]);
+                               continue;
+                       }
+                               
+                       // set sanitized info
+                       $array[$k] = sprintf("%s=%s", $key, $val);
+               }
+       }
+}
+
+/**
+ * Convert array for sanitizeArray function
+ */
+function convArrayForSanitizing($src, &$array)
+{
+       $array = array();
+       foreach ($src as $key => $val) {
+               if (key_exists($key, $_GET)) {
+                       array_push($array, sprintf("%s=%s", $key, $val));
+               }
+       }
+}
+
+/**
+ * Revert array after sanitizeArray function
+ */
+function revertArrayForSanitizing($array, &$dst)
+{
+       foreach ($array as $v) {
+               list($key, $val) = preg_split("/=/", $v, 2);
+               $dst[$key] = $val;
+       }
+}
+
 /**
  * Stops processing the request and redirects to the given URL.
  * - no actual contents should have been sent to the output yet
index 620dcef..02c1b96 100755 (executable)
@@ -1,8 +1,8 @@
 <?php
 // by Edd Dumbill (C) 1999-2002
 // <edd@usefulinc.com>
-// $Id: xmlrpcs.inc.php,v 1.7 2006-07-12 07:11:47 kimitake Exp $
-// $NucleusJP: xmlrpcs.inc.php,v 1.6 2005/08/13 07:24:44 kimitake Exp $
+// $Id: xmlrpcs.inc.php,v 1.8 2007-01-31 10:02:58 kimitake Exp $
+// $NucleusJP: xmlrpcs.inc.php,v 1.7 2006/07/12 07:11:47 kimitake Exp $
 
 // Copyright (c) 1999,2000,2002 Edd Dumbill.
 // All rights reserved.
                        $_xh[$parser]['stack']=array();
                        $_xh[$parser]['sp'] = 0;
                        $_xh[$parser]['valuestack'] = array();
-                       $_xh[$parser]['vsp'] = 0;
                        $_xh[$parser]['method']='';
 
                        // decompose incoming XML into request structure
index 13808a3..826b2b0 100644 (file)
@@ -1,12 +1,12 @@
-<?php
+\<?php
 
    /* ==========================================================================================
        * Nucleus SkinFiles Plugin
        *
        * Copyright 2005 by Jeff MacMichael and Niels Leenheer
        *
-       * @version $Id: index.php,v 1.3 2007-01-29 22:07:42 kimitake Exp $
-       * @version $NucleusJP: index.php,v 1.5.2.1 2005/08/25 07:04:13 kimitake Exp $
+       * @version $Id: index.php,v 1.4 2007-01-31 10:02:58 kimitake Exp $
+       * @version $NucleusJP: index.php,v 1.3 2007/01/29 22:07:42 kimitake Exp $
        *
        * ==========================================================================================
        * This program is free software and open source software; you can redistribute
index 2e2f253..27ebf94 100755 (executable)
@@ -4,6 +4,23 @@ function upgrade_do32() {
        if (upgrade_checkinstall(32))
                return 'already installed';
 
+       // The version number of 3.20 and 3.21 are wrong,
+       // so this upgrade function will be called.
+       // But database already exists, should update db version only.
+       $query = 'SELECT * FROM ' . sql_table('activation');
+       $res = mysql_query($query);
+       $installed = ($res != 0) && (mysql_num_rows($res) >= 0);
+       if ($installed)
+       {
+               // 3.1 -> 3.1+
+               // update database version  
+               $query = 'UPDATE ' . sql_table('config') . ' set value=\'323\' where name=\'DatabaseVersion\'';
+               upgrade_query('Updating DatabaseVersion in config table to 323', $query);
+
+               return;
+       }
+
+
        // create nucleus_activation table
        $query = 'CREATE TABLE ' . sql_table('activation') . ' ('
                   . ' vkey varchar(40) NOT NULL default \'\','
@@ -30,8 +47,8 @@ function upgrade_do32() {
 
        // 3.1 -> 3.1+
        // update database version  
-       $query = 'UPDATE ' . sql_table('config') . ' set value=\'320\' where name=\'DatabaseVersion\'';
-       upgrade_query('Updating DatabaseVersion in config table to 320', $query);
+       $query = 'UPDATE ' . sql_table('config') . ' set value=\'323\' where name=\'DatabaseVersion\'';
+       upgrade_query('Updating DatabaseVersion in config table to 323', $query);
        
        // nothing!
 }
index 4ddd643..6206ebe 100755 (executable)
@@ -1,47 +1,43 @@
-<nucleusskin>\r
-       <meta>\r
-               <skin name="feeds/atom" />\r
-               <template name="feeds/atom/modified" />\r
-               <template name="feeds/atom/entries" />\r
-       </meta>\r
-\r
-\r
-       <skin name="feeds/atom" type="application/atom+xml" includeMode="normal" includePrefix="">\r
-               <description>Atom 0.3 weblog syndication</description>\r
-               <part name="index"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>\r
-<feed version="0.3" xmlns="http://purl.org/atom/ns#">\r
-    <title><%blogsetting(name)%></title>\r
-    <link rel="alternate" type="text/html" href="<%blogsetting(url)%>" />\r
-    <generator url="http://nucleuscms.org/"><%version%></generator>\r
-    <modified><%blog(feeds/atom/modified,1)%></modified>\r
-    <%blog(feeds/atom/entries,10)%>\r
-</feed>]]></part>\r
-\r
-       </skin>\r
-\r
-\r
-       <template name="feeds/atom/modified">\r
-               <description>Atom feeds: Inserts last modification date</description>\r
-               <part name="ITEM"><![CDATA[<%date(utc)%>]]></part>\r
-\r
-       </template>\r
-\r
-\r
-       <template name="feeds/atom/entries">\r
-               <description>Atom feeds: Feed items</description>\r
-               <part name="ITEM"><![CDATA[<entry>\r
- <title type="text/html" mode="escaped"><![CDATA[<%title%>]]]]><![CDATA[></title>\r
- <link rel="alternate" type="text/html" href="<%blogurl%>?itemid=<%itemid%>" />\r
- <author>\r
-  <name><%author%></name>\r
- </author>\r
- <modified><%date(utc)%></modified>\r
- <issued><%date(iso8601)%></issued>\r
- <content type="text/html" mode="escaped"><![CDATA[<%body%><%more%>]]]]><![CDATA[></content>\r
- <id><%blogurl%>:<%blogid%>:<%itemid%></id>\r
-</entry>]]></part>\r
-\r
-       </template>\r
-\r
-\r
-</nucleusskin>\r
+<nucleusskin>
+       <meta>
+               <skin name="feeds/atom" />
+               <template name="feeds/atom/modified" />
+               <template name="feeds/atom/entries" />
+               <info><![CDATA[Atom 0.3 weblog syndication]]></info>
+       </meta>
+       
+       <skin name="feeds/atom" type="application/atom+xml" includeMode="normal" includePrefix="">
+               <description>Atom 0.3 weblog syndication</description>
+               <part name="index"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+    <title><%blogsetting(name)%></title>
+    <link rel="alternate" type="text/html" href="<%blogsetting(url)%>" />
+    <generator url="http://nucleuscms.org/"><%version%></generator>
+    <modified><%blog(feeds/atom/modified,1)%></modified>
+    <%blog(feeds/atom/entries,10)%>
+</feed>]]></part>
+       </skin>
+
+       <template name="feeds/atom/modified">
+               <description>Atom feeds: Inserts last modification date</description>
+               <part name="ITEM"><![CDATA[<%date(utc)%>]]></part>
+       </template>
+
+       <template name="feeds/atom/entries">
+               <description>Atom feeds: Feed items</description>
+               <part name="ITEM"><![CDATA[<entry>
+ <title type="text/html" mode="escaped"><![CDATA[<%title%>]]></title>
+ <link rel="alternate" type="text/html" href="<%blogurl%>index.php?itemid=<%itemid%>" />
+ <author>
+  <name><%author%></name>
+ </author>
+ <modified><%date(utc)%></modified>
+ <issued><%date(iso8601)%></issued>
+ <content type="text/html" mode="escaped"><![CDATA[<%body%><%more%>]]></content>
+ <id><%blogurl%>:<%blogid%>:<%itemid%></id>
+</entry>]]></part>
+               <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+               <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
+               <part name="POPUP_CODE"><![CDATA[<%media%>]]></part>
+       </template>
+</nucleusskin>
\ No newline at end of file
index 148bd30..29e8855 100644 (file)
@@ -28,7 +28,7 @@ form
 /* Headings */
 h1,h2,h3,h4,h5,h6
 {
-    font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Trebuchet, Arial, sans-serif;
+       font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Trebuchet, Arial, sans-serif;
        font-weight: normal;
        margin: 0;
 }
@@ -294,7 +294,7 @@ a:hover, a:active
        color: #3A3523;
        font-size: 12px;
        font-weight: bold;
-    font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", Arial, "Trebuchet MS", sans-serif;
+       font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", Arial, "Trebuchet MS", sans-serif;
        padding: 4px 10px;
 }
 .sidebardl dd
@@ -345,16 +345,16 @@ a:hover, a:active
 .commentform, .mailform
 {
        margin-top: 10px;
-    padding: 10px;
-    background: #EEEEEE;
-    /* Rounded borders, for Mozilla browsers */
-    /* -moz-border-radius: 10px; */
+       padding: 10px;
+       background: #EEEEEE;
+       /* Rounded borders, for Mozilla browsers */
+       /* -moz-border-radius: 10px; */
 }
 .commentform img{
-    margin: 5px 0 0 0;
+       margin: 5px 0 0 0;
 }
-.formfield
-{
+.formfield {
+       display:block;
        font-size: 11px;
        background: white;
        color: #494949;
@@ -375,60 +375,63 @@ a:hover, a:active
        border-right: 1px solid #868686;
        margin: 1px 0 0 0;
 }
+.commentform .formfield, .commentform .formbutton, .loginform .formbutton {
+       display: block;
+}
 .searchform .formfield
 {
        width: 130px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .searchform .formbutton
 {
        width: 60px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
 .loginform .formfield
 {
        width: 130px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .loginform .formbutton
 {
        width: 60px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
 .mainform .formfield
 {
        width: 280px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .mailform .formbutton
 {
        width: 100px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
-#nucleus_cf_name, #nucleus_cf_mail
+#nucleus_cf_name, #nucleus_cf_mail, #nucleus_cf_email
 {
-    width: 300px;
-    margin-right: 105px;
-    font-family: Arial, Trebuchet MS, Verdana, sans-serif;
+       width: 300px;
+       margin-right: 105px;
+       font-family: Arial, Trebuchet MS, Verdana, sans-serif;
 }
 .commentform textarea, .commentform .formfield, .mailform textarea, .mailform .formfield
 {
-    width: 300px;
+       width: 300px;
 }
 .commentform .formbutton
 {
        width: 100px;
        height: 22px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
 }
 .error
 {
@@ -436,7 +439,6 @@ a:hover, a:active
        font-weight: bold;
 }
 
-
 /*-------------------------------------------------
   Miscelaneous
 -------------------------------------------------*/
index a4013bc..7e6f5b5 100644 (file)
@@ -28,7 +28,7 @@ form
 /* Headings */
 h1,h2,h3,h4,h5,h6
 {
-    font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Trebuchet, Arial, sans-serif;
+       font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Trebuchet, Arial, sans-serif;
        font-weight: normal;
        margin: 0;
 }
@@ -294,7 +294,7 @@ a:hover, a:active
        color: #3A3523;
        font-size: 12px;
        font-weight: bold;
-    font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", Arial, "Trebuchet MS", sans-serif;
+       font-family: "Georgia", "Lucida Grande", "Lucida Sans Unicode", Arial, "Trebuchet MS", sans-serif;
        padding: 4px 10px;
 }
 .sidebardl dd
@@ -345,16 +345,16 @@ a:hover, a:active
 .commentform, .mailform
 {
        margin-top: 10px;
-    padding: 10px;
-    background: #EEEEEE;
-    /* Rounded borders, for Mozilla browsers */
-    /* -moz-border-radius: 10px; */
+       padding: 10px;
+       background: #EEEEEE;
+       /* Rounded borders, for Mozilla browsers */
+       /* -moz-border-radius: 10px; */
 }
 .commentform img{
-    margin: 5px 0 0 0;
+       margin: 5px 0 0 0;
 }
-.formfield
-{
+.formfield {
+       display:block;
        font-size: 11px;
        background: white;
        color: #494949;
@@ -375,60 +375,63 @@ a:hover, a:active
        border-right: 1px solid #868686;
        margin: 1px 0 0 0;
 }
+.commentform .formfield, .commentform .formbutton, .loginform .formbutton {
+       display: block;
+}
 .searchform .formfield
 {
        width: 130px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .searchform .formbutton
 {
        width: 60px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
 .loginform .formfield
 {
        width: 130px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .loginform .formbutton
 {
        width: 60px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
 .mainform .formfield
 {
        width: 280px;
-    font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
+       font-family: Arial, Tahoma, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 0;
        margin: 0 2px 2px 0;
 }
 .mailform .formbutton
 {
        width: 100px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
        padding: 2px 2px;
 }
-#nucleus_cf_name, #nucleus_cf_mail
+#nucleus_cf_name, #nucleus_cf_mail, #nucleus_cf_email
 {
-    width: 300px;
-    margin-right: 105px;
-    font-family: Arial, Trebuchet MS, Verdana, sans-serif;
+       width: 300px;
+       margin-right: 105px;
+       font-family: Arial, Trebuchet MS, Verdana, sans-serif;
 }
 .commentform textarea, .commentform .formfield, .mailform textarea, .mailform .formfield
 {
-    width: 300px;
+       width: 300px;
 }
 .commentform .formbutton
 {
        width: 100px;
        height: 22px;
-    font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
+       font-family: Tahoma, Arial, Trebuchet MS, Verdana, sans-serif;
 }
 .error
 {
@@ -436,7 +439,6 @@ a:hover, a:active
        font-weight: bold;
 }
 
-
 /*-------------------------------------------------
   Miscelaneous
 -------------------------------------------------*/
index be12aaa..3503fd8 100644 (file)
@@ -7,8 +7,8 @@
 
 <!-- meta information for search engines -->
 <meta name="generator" content="<%version%>" />
-<meta name="name" content="<%blogsetting(name)%>" />
-<meta name="description" content="<%blogsetting(desc)%>" />
+<meta name="name" content="<%if(skintype,error)%><%sitevar(name)%><%else%><%blogsetting(name)%><%endif%>" />
+<meta name="description" content="<%if(skintype,error)%><%sitevar(name)%><%else%><%blogsetting(desc)%><%endif%>" />
 
 <!-- prevent caching (can be removed) -->
 <meta http-equiv="Pragma" content="no-cache" />
index 57a2bc9..169f70a 100644 (file)
@@ -31,7 +31,7 @@
 
 <!-- item: page title and extra navigational links -->
 <%if(skintype,item)%>
-<title><%blogsetting(name)%> &raquo; <%itemtitle%></title>
+<title><%blogsetting(name)%> &raquo; <%itemtitle(attribute)%></title>
 <link rel="archives" title="Archives" href="<%archivelink%>" />
 <link rel="top" title="Today" href="<%sitevar(url)%>" />
 <link rel="next" href="<%nextlink%>" title="Next Item" />
index 8bc001b..c82b41a 100644 (file)
 </div>
 <%endif%><%endif%>
 
+<!-- bloglist-->
+<div class="sidebar">
+<dl class="sidebardl">
+<dt>Blogs</dt>
+<%bloglist(default/index)%>
+</dl>
+</div>
+
 <!-- search form -->
 <div class="sidebar">
 <dl class="sidebardl">
index 4408830..25c9c59 100644 (file)
-<nucleusskin>\r
-       <meta>\r
-               <skin name="default" />\r
-               <template name="default/index" />\r
-               <template name="default/item" />\r
-       </meta>\r
-\r
-\r
-       <skin name="default" type="text/html" includeMode="skindir" includePrefix="default/">\r
-               <description>Nucleus CMS default skin</description>\r
-               <part name="archive"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Archives</h2>\r
-</div>\r
-You are currently viewing archive for <%archivedate%>\r
-</div>\r
-<div class="content">\r
-<%archive(default/index)%>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="archivelist"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Archives</h2>\r
-</div>\r
-<dl>\r
-<dt>Monthly Archives</dt>\r
-<%archivelist(default/index)%>\r
-</dl>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="error"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Error!</h2>\r
-</div>\r
-<%errormessage%><br /><br />\r
-<a href="javascript:history.go(-1);">Go back</a>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="imagepopup"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\r
-\r
-<html>\r
-<head>\r
-<title><%imagetext%></title>\r
-<style type="text/css">\r
-img { border: none; }\r
-body { margin: 0px; }\r
-</style>\r
-</head>\r
-\r
-<!-- image content -->\r
-<body onblur="window.close()">\r
-<a href="javascript:window.close();"><%image%></a>\r
-</body>\r
-\r
-</html>]]></part>\r
-\r
-               <part name="index"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<%blog(default/index,10)%>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="item"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<%item(default/item)%>\r
-</div>\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Comments</h2>\r
-</div>\r
-<a name="c"></a>\r
-<%comments(default/item)%>\r
-</div>\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Add Comment</h2>\r
-</div>\r
-<%commentform%>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="member"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Info about <%member(name)%></h2>\r
-</div>\r
-Real name: <%member(realname)%>\r
-<br /><br />\r
-Website: <a href="<%member(url)%>"><%member(url)%></a>\r
-</div>\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Send message</h2>\r
-</div>\r
-<%membermailform%>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-               <part name="search"><![CDATA[<%parsedinclude(head.inc)%>\r
-\r
-<!-- page header -->\r
-<%parsedinclude(header.inc)%>\r
-\r
-<!-- page content -->\r
-<div id="container">\r
-<div class="content">\r
-<div class="contenttitle">\r
-<h2>Search Results</h2>\r
-</div>\r
-<%searchform%>\r
-</div>\r
-<div class="content">\r
-<%searchresults(default/index)%>\r
-</div>\r
-</div>\r
-\r
-<!-- page menu -->\r
-<h2 class="hidden">Sidebar</h2>\r
-<div id="sidebarcontainer">\r
-<%parsedinclude(sidebar.inc)%>\r
-</div>\r
-\r
-<!-- page footer -->\r
-<%parsedinclude(footer.inc)%>]]></part>\r
-\r
-       </skin>\r
-\r
-\r
-       <template name="default/index">\r
-               <description>Nucleus CMS default index template</description>\r
-               <part name="ARCHIVELIST_LISTITEM"><![CDATA[<dd>\r
-<a href="<%archivelink%>" title="Archive for %B, %Y">%B, %Y</a>\r
-</dd>]]></part>\r
-\r
-               <part name="CATLIST_HEADER"><![CDATA[<dd>\r
-<a href="<%blogurl%>" title="All categories">All</a>\r
-</dd>]]></part>\r
-\r
-               <part name="CATLIST_LISTITEM"><![CDATA[<dd>\r
-<a href="<%catlink%>" title="Category: <%catname%>"><%catname%></a>\r
-</dd>]]></part>\r
-\r
-               <part name="COMMENTS_MANY"><![CDATA[Comments]]></part>\r
-\r
-               <part name="COMMENTS_NONE"><![CDATA[<div class="contentitem3">\r
-<small class="contentitemcomments">\r
-<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on '<%itemtitle%>'">Add comment</a>\r
-</small>\r
-</div>]]></part>\r
-\r
-               <part name="COMMENTS_ONE"><![CDATA[Comment]]></part>\r
-\r
-               <part name="COMMENTS_TOOMUCH"><![CDATA[<div class="contentitem3">\r
-<small class="contentitemcomments">\r
-<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on '<%itemtitle%>'"><%commentcount%> <%commentword%></a>\r
-</small>\r
-</div>]]></part>\r
-\r
-               <part name="EDITLINK"><![CDATA[<div class="contentitem4">\r
-<small class="contentitemedit">\r
-<a href="<%editlink%>" title="Make changes to your entry" onclick="<%editpopupcode%>" >Edit item</a>\r
-</small>\r
-</div>]]></part>\r
-\r
-               <part name="FORMAT_DATE"><![CDATA[%m/%d]]></part>\r
-\r
-               <part name="FORMAT_TIME"><![CDATA[%X]]></part>\r
-\r
-               <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>\r
-\r
-               <part name="ITEM"><![CDATA[<div class="contenttitle">\r
-<h2><%date%>: <a href="<%itemlink%>" title="Read entry: <%title%>"><%title%></a></h2>\r
-</div>\r
-<div class="contentitem">\r
-<div class="contentitem1">\r
-<small class="contentitemcategory">\r
-Category: <a href="<%categorylink%>" title="Category: <%Category%>"><%Category%></a>\r
-</small>\r
-</div>\r
-<div class="contentitem2">\r
-<small class="contentitempostedby">\r
-Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>\r
-</small>\r
-</div>\r
-<%comments%>\r
-<%edit%>\r
-</div>\r
-<div class="contentbody">\r
-<%body%>\r
-<%morelink%>\r
-</div>]]></part>\r
-\r
-               <part name="LOCALE"><![CDATA[en]]></part>\r
-\r
-               <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>\r
-\r
-               <part name="MORELINK"><![CDATA[<p>&raquo;\r
-<a href="<%itemlink%>#more" title="Read more on '<%title%>'">Read More</a>\r
-</p>]]></part>\r
-\r
-               <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>\r
-\r
-               <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>\r
-\r
-               <part name="SEARCH_NOTHINGFOUND"><![CDATA[No search results found for <b><%query%></b>]]></part>\r
-\r
-       </template>\r
-\r
-\r
-       <template name="default/item">\r
-               <description>Nucleus CMS default item template</description>\r
-               <part name="COMMENTS_BODY"><![CDATA[<div class="itemcomment id<%memberid%>">\r
-<h3><a href="<%userlinkraw%>"\r
-title="<%ip%> | Click to visit <%user%>'s website or send an email">\r
-<%user%></a> wrote:</h3>\r
-<div class="commentbody">\r
-<%body%>\r
-</div>\r
-<div class="commentinfo">\r
-<%date%> <%time%>\r
-</div>\r
-</div>]]></part>\r
-\r
-               <part name="COMMENTS_MANY"><![CDATA[comments]]></part>\r
-\r
-               <part name="COMMENTS_NONE"><![CDATA[<div class="comments">No comments yet</div>]]></part>\r
-\r
-               <part name="COMMENTS_ONE"><![CDATA[comment]]></part>\r
-\r
-               <part name="EDITLINK"><![CDATA[<div class="contentitem4">\r
-<small class="contentitemedit">\r
-<a href="<%editlink%>" title="Make changes to your entry" onclick="<%editpopupcode%>" >Edit item</a>\r
-</small>\r
-</div>]]></part>\r
-\r
-               <part name="FORMAT_DATE"><![CDATA[%m/%d]]></part>\r
-\r
-               <part name="FORMAT_TIME"><![CDATA[%X]]></part>\r
-\r
-               <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>\r
-\r
-               <part name="ITEM"><![CDATA[<div class="contenttitle">\r
-<h2><%date%>: <%title%></h2>\r
-</div>\r
-<div class="contentitem">\r
-<div class="contentitem1">\r
-<small class="contentitemcategory">\r
-Category: <a href="<%categorylink%>" title="Category: <%category%>"><%category%></a>\r
-</small>\r
-</div>\r
-<div class="contentitem2">\r
-<small class="contentitempostedby">\r
-Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>\r
-</small>\r
-</div>\r
-<%edit%>\r
-</div>\r
-<div class="contentbody">\r
-<%body%><br /><br />\r
-<a name="more"></a><%more%>\r
-</div>]]></part>\r
-\r
-               <part name="LOCALE"><![CDATA[en]]></part>\r
-\r
-               <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>\r
-\r
-               <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>\r
-\r
-               <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>\r
-\r
-       </template>\r
-\r
-\r
-</nucleusskin>
\ No newline at end of file
+<nucleusskin>
+<meta>
+       <skin name="default" />
+       <template name="default/index" />
+       <template name="default/item" />
+       <info><![CDATA[Nucleus CMS Default Skin]]></info>
+</meta>
+
+<skin name="default" type="text/html" includeMode="skindir" includePrefix="default/">
+
+<description>Nucleus CMS default skin</description>
+
+
+       <part name="archive"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<div class="contenttitle">
+<h2>Archives</h2>
+</div>
+You are currently viewing archive for <%archivedate%>
+</div>
+<div class="content">
+<%archive(default/index)%>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="archivelist"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<div class="contenttitle">
+<h2>Archives</h2>
+</div>
+<dl>
+<dt>Monthly Archives</dt>
+<%archivelist(default/index)%>
+</dl>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="error"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<div class="contenttitle">
+<h2>Error!</h2>
+</div>
+<%errormessage%><br /><br />
+<a href="javascript:history.go(-1);">Go back</a>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="imagepopup"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title><%imagetext%></title>
+<style type="text/css">
+img { border: none; }
+body { margin: 0px; }
+</style>
+</head>
+
+<!-- image content -->
+<body onblur="window.close()">
+<a href="javascript:window.close();"><%image%></a>
+</body>
+
+</html>]]></part>
+
+
+       <part name="index"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<%blog(default/index,10)%>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="item"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<%item(default/item)%>
+</div>
+<div class="content">
+<div class="contenttitle">
+<h2>Comments</h2>
+</div>
+<a name="c"></a>
+<%comments(default/item)%>
+</div>
+<div class="content">
+<div class="contenttitle">
+<h2>Add Comment</h2>
+</div>
+<%commentform%>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="member"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<div class="contenttitle">
+<h2>Info about <%member(name)%></h2>
+</div>
+Real name: <%member(realname)%>
+<br /><br />
+Website: <a href="<%member(url)%>"><%member(url)%></a>
+</div>
+<div class="content">
+<div class="contenttitle">
+<h2>Send message</h2>
+</div>
+<%membermailform%>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+
+       <part name="search"><![CDATA[<%parsedinclude(head.inc)%>
+
+<!-- page header -->
+<%parsedinclude(header.inc)%>
+
+<!-- page content -->
+<div id="container">
+<div class="content">
+<div class="contenttitle">
+<h2>Search Results</h2>
+</div>
+<%searchform%>
+</div>
+<div class="content">
+<%searchresults(default/index)%>
+</div>
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer">
+<%parsedinclude(sidebar.inc)%>
+</div>
+
+<!-- page footer -->
+<%parsedinclude(footer.inc)%>]]></part>
+
+</skin>
+
+
+<template name="default/index">
+
+<description>Nucleus CMS default index template</description>
+
+       <part name="ARCHIVELIST_LISTITEM"><![CDATA[<dd>
+<a href="<%archivelink%>" title="Archive for %B, %Y">%B, %Y</a>
+</dd>]]></part>
+
+       <part name="BLOGLIST_LISTITEM"><![CDATA[<dd>
+<a href="<%bloglink%>" title="<%blogdesc%>"><%blogname%></a>
+</dd>]]></part>
+
+       <part name="CATLIST_HEADER"><![CDATA[<dd>
+<a href="<%blogurl%>" title="All categories">All</a>
+</dd>]]></part>
+
+       <part name="CATLIST_LISTITEM"><![CDATA[<dd>
+<a href="<%catlink%>" title="Category: <%catname%>"><%catname%></a>
+</dd>]]></part>
+
+       <part name="COMMENTS_MANY"><![CDATA[Comments]]></part>
+
+       <part name="COMMENTS_NONE"><![CDATA[<div class="contentitem3">
+<small class="contentitemcomments">
+<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on '<%itemtitle(attribute)%>'">Add comment</a>
+</small>
+</div>]]></part>
+
+       <part name="COMMENTS_ONE"><![CDATA[Comment]]></part>
+
+       <part name="COMMENTS_TOOMUCH"><![CDATA[<div class="contentitem3">
+<small class="contentitemcomments">
+<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on '<%itemtitle(attribute)%>'"><%commentcount%> <%commentword%></a>
+</small>
+</div>]]></part>
+
+       <part name="EDITLINK"><![CDATA[<div class="contentitem4">
+<small class="contentitemedit">
+<a href="<%editlink%>" title="Make changes to your entry" onclick="<%editpopupcode%>" >Edit item</a>
+</small>
+</div>]]></part>
+
+       <part name="FORMAT_DATE"><![CDATA[%d/%m]]></part>
+
+       <part name="FORMAT_TIME"><![CDATA[%X]]></part>
+
+       <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+
+       <part name="ITEM"><![CDATA[<div class="contenttitle">
+<h2><%date%>: <a href="<%itemlink%>" title="Read entry: <%title(attribute)%>"><%title(raw)%></a></h2>
+</div>
+<div class="contentitem">
+<div class="contentitem1">
+<small class="contentitemcategory">
+Category: <a href="<%categorylink%>" title="Category: <%Category%>"><%Category%></a>
+</small>
+</div>
+<div class="contentitem2">
+<small class="contentitempostedby">
+Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>
+</small>
+</div>
+<%comments%>
+<%edit%>
+</div>
+<div class="contentbody">
+<%body%>
+<%morelink%>
+</div>]]></part>
+
+       <part name="LOCALE"><![CDATA[en]]></part>
+
+       <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
+
+       <part name="MORELINK"><![CDATA[<p>&raquo;
+<a href="<%itemlink%>#more" title="Read more on '<%title(attribute)%>'">Read More</a>
+</p>]]></part>
+
+       <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
+
+       <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>
+
+       <part name="SEARCH_NOTHINGFOUND"><![CDATA[No search results found for <b><%query%></b>]]></part>
+
+</template>
+
+
+<template name="default/item">
+
+<description>Nucleus CMS default item template</description>
+
+       <part name="COMMENTS_BODY"><![CDATA[<div class="itemcomment id<%memberid%>">
+<h3><a href="<%userlinkraw%>"
+title="<%ip%> | Click to visit <%user%>'s website or send an email">
+<%user%></a> wrote:</h3>
+<div class="commentbody">
+<%body%>
+</div>
+<div class="commentinfo">
+<%date%> <%time%>
+</div>
+</div>]]></part>
+
+       <part name="COMMENTS_MANY"><![CDATA[comments]]></part>
+
+       <part name="COMMENTS_NONE"><![CDATA[<div class="comments">No comments yet</div>]]></part>
+
+       <part name="COMMENTS_ONE"><![CDATA[comment]]></part>
+
+       <part name="EDITLINK"><![CDATA[<div class="contentitem4">
+<small class="contentitemedit">
+<a href="<%editlink%>" title="Make changes to your entry" onclick="<%editpopupcode%>" >Edit item</a>
+</small>
+</div>]]></part>
+
+       <part name="FORMAT_DATE"><![CDATA[%d/%m]]></part>
+
+       <part name="FORMAT_TIME"><![CDATA[%X]]></part>
+
+       <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+
+       <part name="ITEM"><![CDATA[<div class="contenttitle">
+<h2><%date%>: <%title(raw)%></h2>
+</div>
+<div class="contentitem">
+<div class="contentitem1">
+<small class="contentitemcategory">
+Category: <a href="<%categorylink%>" title="Category: <%category%>"><%category%></a>
+</small>
+</div>
+<div class="contentitem2">
+<small class="contentitempostedby">
+Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>
+</small>
+</div>
+<%edit%>
+</div>
+<div class="contentbody">
+<%body%><br /><br />
+<a name="more"></a><%more%>
+</div>]]></part>
+
+       <part name="LOCALE"><![CDATA[en]]></part>
+
+       <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
+
+       <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
+
+       <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>
+
+</template>
+
+</nucleusskin>
index 8c8e09b..73fe5ad 100755 (executable)
@@ -1,29 +1,29 @@
-<nucleusskin>\r
-       <meta>\r
-               <skin name="xml/rsd" />\r
-       </meta>\r
-\r
-\r
-       <skin name="xml/rsd" type="text/xml" includeMode="normal" includePrefix="">\r
-               <description>RSD (Really Simple Discovery) information for weblog clients</description>\r
-               <part name="index"><![CDATA[<?xml version="1.0"?>\r
-<rsd version="1.0">\r
- <service>\r
-  <engineName><%version%></engineName>\r
-  <engineLink>http://nucleuscms.org/</engineLink>\r
-  <homepageLink><%sitevar(url)%></homepageLink>\r
-  <apis>\r
-   <api name="MetaWeblog" preferred="true" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r
-    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r
-   </api>\r
-   <api name="Blogger" preferred="false" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r
-    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r
-   </api>\r
-  </apis>\r
- </service>\r
-</rsd>]]></part>\r
-\r
-       </skin>\r
-\r
-\r
+<nucleusskin>
+       <meta>
+               <skin name="xml/rsd" />
+       </meta>
+
+
+       <skin name="xml/rsd" type="text/xml" includeMode="normal" includePrefix="">
+               <description>RSD (Really Simple Discovery) information for weblog clients</description>
+               <part name="index"><![CDATA[<?xml version="1.0"?>
+<rsd version="1.0">
+ <service>
+  <engineName><%version%></engineName>
+  <engineLink>http://nucleuscms.org/</engineLink>
+  <homepageLink><%sitevar(url)%></homepageLink>
+  <apis>
+   <api name="MetaWeblog" preferred="true" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">
+       <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>
+   </api>
+   <api name="Blogger" preferred="false" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">
+       <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>
+   </api>
+  </apis>
+ </service>
+</rsd>]]></part>
+
+       </skin>
+
+
 </nucleusskin>
\ No newline at end of file
index 0836b4a..696d489 100755 (executable)
@@ -1,54 +1,55 @@
-<nucleusskin>\r
-       <meta>\r
-               <skin name="feeds/rss20" />\r
-               <template name="feeds/rss20" />\r
-       </meta>\r
-\r
-\r
-       <skin name="feeds/rss20" type="text/xml" includeMode="normal" includePrefix="">\r
-               <description>RSS 2.0 syndication of weblogs</description>\r
-               <part name="index"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>\r
-<rss version="2.0">\r
-  <channel>\r
-    <title><%blogsetting(name)%></title>\r
-    <link><%blogsetting(url)%></link>\r
-    <description><%blogsetting(desc)%></description>\r
-    <!-- optional tags -->\r
-    <language>ja</language>           <!-- valid langugae goes here -->\r
-    <generator><%version%></generator>\r
-       <copyright>&#169;</copyright>             <!-- Copyright notice -->\r
-    <category>Weblog</category>\r
-    <docs>http://backend.userland.com/rss</docs>\r
-    <image>\r
-      <url><%adminurl%>nucleus2.gif</url>\r
-      <title><%blogsetting(name)%></title>\r
-      <link><%blogsetting(url)%></link>\r
-    </image>\r
-    <%blog(feeds/rss20,10)%>\r
-  </channel>\r
-</rss>]]></part>\r
-\r
-       </skin>\r
-\r
-\r
-       <template name="feeds/rss20">\r
-               <description>Used for RSS 2.0 syndication of your blog</description>\r
-               <part name="EDITLINK"><![CDATA[<a href="<%editlink%>" onclick="<%editpopupcode%>">edit</a>]]></part>\r
-\r
-               <part name="FORMAT_DATE"><![CDATA[%Y-%m-%d]]></part>\r
-\r
-               <part name="FORMAT_TIME"><![CDATA[%H:%M:%S]]></part>\r
-\r
-               <part name="ITEM"><![CDATA[<item>\r
- <title><![CDATA[<%title%>]]]]><![CDATA[></title>\r
- <link><%blogurl%>?itemid=<%itemid%></link>\r
-<description><![CDATA[<%body%><%more%>]]]]><![CDATA[></description>\r
- <category><%category%></category>\r
-<comments><%blogurl%>?itemid=<%itemid%></comments>\r
- <pubDate><%date(rfc822)%></pubDate>\r
-</item>]]></part>\r
-\r
-       </template>\r
-\r
-\r
-</nucleusskin>\r
+<nucleusskin>
+       <meta>
+               <skin name="feeds/rss20" />
+               <template name="feeds/rss20" />
+       </meta>
+
+
+       <skin name="feeds/rss20" type="text/xml" includeMode="normal" includePrefix="">
+               <description>RSS 2.0 syndication of weblogs</description>
+               <part name="index"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+  <channel>
+    <title><%blogsetting(name)%></title>
+    <link><%blogsetting(url)%></link>
+    <description><%blogsetting(desc)%></description>
+    <!-- optional tags -->
+    <language>ja</language>           <!-- valid langugae goes here -->
+    <generator><%version%></generator>
+       <copyright>&#169;</copyright>             <!-- Copyright notice -->
+    <category>Weblog</category>
+    <docs>http://backend.userland.com/rss</docs>
+    <image>
+      <url><%adminurl%>nucleus2.gif</url>
+      <title><%blogsetting(name)%></title>
+      <link><%blogsetting(url)%></link>
+    </image>
+    <%blog(feeds/rss20,10)%>
+  </channel>
+</rss>]]></part>
+
+       </skin>
+
+
+       <template name="feeds/rss20">
+               <description>Used for RSS 2.0 syndication of your blog</description>
+               <part name="EDITLINK"><![CDATA[<a href="<%editlink%>" onclick="<%editpopupcode%>">edit</a>]]></part>
+
+               <part name="FORMAT_DATE"><![CDATA[%Y-%m-%d]]></part>
+
+               <part name="FORMAT_TIME"><![CDATA[%H:%M:%S]]></part>
+
+               <part name="ITEM"><![CDATA[<item>
+ <title><![CDATA[<%title%>]]]]><![CDATA[></title>
+ <link><%blogurl%>?itemid=<%itemid%></link>
+<description><![CDATA[<%body%><%more%>]]]]><![CDATA[></description>
+ <category><%category%></category>
+<comments><%blogurl%>?itemid=<%itemid%></comments>
+ <pubDate><%date(rfc822)%></pubDate>
+</item>]]></part>
+
+<part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+<part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
+<part name="POPUP_CODE"><![CDATA[<%media%>]]></part>
+
+</template></nucleusskin>
\ No newline at end of file