sync with 3.24JP and 3.3 original

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

diff --git a/skins/atom/skinbackup.xml b/skins/atom/skinbackup.xml
index 6206ebe..63192c1 100755 (executable)
--- a/skins/atom/skinbackup.xml
+++ b/skins/atom/skinbackup.xml
@@ -3,9 +3,11 @@
                <skin name="feeds/atom" />
                <template name="feeds/atom/modified" />
                <template name="feeds/atom/entries" />
-               <info><![CDATA[Atom 0.3 weblog syndication]]></info>
+               <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"?>
@@ -18,26 +20,29 @@
 </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%>" />
+ <title type="text/html" mode="escaped"><![CDATA[<%title%>]]]]><![CDATA[></title>
+ <link rel="alternate" type="text/html" href="<%blogurl%>?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>
+ <content type="text/html" mode="escaped"><![CDATA[<%body%><%more%>]]]]><![CDATA[></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
+
+</nucleusskin>

diff --git a/skins/default/default_left.css b/skins/default/default_left.css
index 29e8855..294c1f3 100644 (file)
--- a/skins/default/default_left.css
+++ b/skins/default/default_left.css
@@ -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,15 +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;
@@ -381,57 +382,57 @@ a:hover, a:active
 .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_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
 {
@@ -439,6 +440,7 @@ a:hover, a:active
        font-weight: bold;
 }
 
+
 /*-------------------------------------------------
   Miscelaneous
 -------------------------------------------------*/

diff --git a/skins/default/default_right.css b/skins/default/default_right.css
index 7e6f5b5..02f3205 100644 (file)
--- a/skins/default/default_right.css
+++ b/skins/default/default_right.css
@@ -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,15 +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;
@@ -381,57 +382,57 @@ a:hover, a:active
 .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_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
 {
@@ -439,6 +440,7 @@ a:hover, a:active
        font-weight: bold;
 }
 
+
 /*-------------------------------------------------
   Miscelaneous
 -------------------------------------------------*/

diff --git a/skins/default/sidebar.inc b/skins/default/sidebar.inc
index c82b41a..7037db0 100644 (file)
--- a/skins/default/sidebar.inc
+++ b/skins/default/sidebar.inc
@@ -7,24 +7,24 @@
 <%if(skintype,archive)%>
 <dd><a href="<%prevlink%>" title="Previous month">Previous <%archivetype%></a></dd>
 <dd><a href="<%nextlink%>" title="Next month">Next <%archivetype%></a></dd>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <dd><a href="<%archivelink%>" title="Archives">Archives</a></dd>
 <%endif%>
 
 <!-- archivelist: navigation -->
 <%if(skintype,archivelist)%>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <dd><a href="<%archivelink%>" title="Archives">Archives</a></dd>
 <%endif%>
 
 <!-- error: navigation -->
 <%if(skintype,error)%>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <%endif%>
 
 <!-- index: navigation -->
 <%if(skintype,index)%>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <dd><a href="<%archivelink%>" title="Archives">Archives</a></dd>
 <%endif%>
 
@@ -32,18 +32,18 @@
 <%if(skintype,item)%>
 <dd><a href="<%nextlink%>" title="Previous item">Previous Item</a></dd>
 <dd><a href="<%prevlink%>" title="Next item">Next Item</a></dd>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <dd><a href="<%archivelink%>" title="Archives">Archives</a></dd>
 <%endif%>
 
 <!-- member: navigation -->
 <%if(skintype,member)%>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <%endif%>
 
 <!-- search: navigation -->
 <%if(skintype,search)%>
-<dd><a href="<%todaylink%>" title="Today's entry">Today</a></dd>
+<dd><a href="<%todaylink%>" title="Today&#39;s entry">Today</a></dd>
 <dd><a href="<%archivelink%>" title="Archives">Archives</a></dd>
 <%endif%>
 

diff --git a/skins/default/skinbackup.xml b/skins/default/skinbackup.xml
index 25c9c59..d964d85 100644 (file)
--- a/skins/default/skinbackup.xml
+++ b/skins/default/skinbackup.xml
@@ -1,17 +1,14 @@
 <nucleusskin>
-<meta>
-       <skin name="default" />
-       <template name="default/index" />
-       <template name="default/item" />
-       <info><![CDATA[Nucleus CMS Default Skin]]></info>
-</meta>
+       <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)%>
+       <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)%>
@@ -38,8 +35,7 @@ You are currently viewing archive for <%archivedate%>
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-
-       <part name="archivelist"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="archivelist"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -66,8 +62,7 @@ You are currently viewing archive for <%archivedate%>
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-
-       <part name="error"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="error"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -92,8 +87,7 @@ You are currently viewing archive for <%archivedate%>
 <!-- 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">
+               <part name="imagepopup"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 <head>
@@ -111,8 +105,7 @@ body { margin: 0px; }
 
 </html>]]></part>
 
-
-       <part name="index"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="index"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -133,8 +126,7 @@ body { margin: 0px; }
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-
-       <part name="item"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="item"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -168,8 +160,7 @@ body { margin: 0px; }
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-
-       <part name="member"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="member"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -201,8 +192,7 @@ Website: <a href="<%member(url)%>"><%member(url)%></a>
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-
-       <part name="search"><![CDATA[<%parsedinclude(head.inc)%>
+               <part name="search"><![CDATA[<%parsedinclude(head.inc)%>
 
 <!-- page header -->
 <%parsedinclude(header.inc)%>
@@ -229,14 +219,12 @@ Website: <a href="<%member(url)%>"><%member(url)%></a>
 <!-- page footer -->
 <%parsedinclude(footer.inc)%>]]></part>
 
-</skin>
-
-
-<template name="default/index">
+       </skin>
 
-<description>Nucleus CMS default index template</description>
 
-       <part name="ARCHIVELIST_LISTITEM"><![CDATA[<dd>
+       <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>
 
@@ -244,43 +232,43 @@ Website: <a href="<%member(url)%>"><%member(url)%></a>
 <a href="<%bloglink%>" title="<%blogdesc%>"><%blogname%></a>
 </dd>]]></part>
 
-       <part name="CATLIST_HEADER"><![CDATA[<dd>
+               <part name="CATLIST_HEADER"><![CDATA[<dd>
 <a href="<%blogurl%>" title="All categories">All</a>
 </dd>]]></part>
 
-       <part name="CATLIST_LISTITEM"><![CDATA[<dd>
+               <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_MANY"><![CDATA[Comments]]></part>
 
-       <part name="COMMENTS_NONE"><![CDATA[<div class="contentitem3">
+               <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>
+<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on &#39;<%itemtitle(attribute)%>&#39;">Add comment</a>
 </small>
 </div>]]></part>
 
-       <part name="COMMENTS_ONE"><![CDATA[Comment]]></part>
+               <part name="COMMENTS_ONE"><![CDATA[Comment]]></part>
 
-       <part name="COMMENTS_TOOMUCH"><![CDATA[<div class="contentitem3">
+               <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>
+<a href="<%itemlink%>#c" rel="bookmark" title="Add comment on &#39;<%itemtitle(attribute)%>&#39;"><%commentcount%> <%commentword%></a>
 </small>
 </div>]]></part>
 
-       <part name="EDITLINK"><![CDATA[<div class="contentitem4">
+               <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_DATE"><![CDATA[%m/%d]]></part>
 
-       <part name="FORMAT_TIME"><![CDATA[%X]]></part>
+               <part name="FORMAT_TIME"><![CDATA[%X]]></part>
 
-       <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+               <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
 
-       <part name="ITEM"><![CDATA[<div class="contenttitle">
+               <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">
@@ -302,28 +290,26 @@ Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>
 <%morelink%>
 </div>]]></part>
 
-       <part name="LOCALE"><![CDATA[en]]></part>
+               <part name="LOCALE"><![CDATA[en]]></part>
 
-       <part name="MEDIA_CODE"><![CDATA[<%media%>]]></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>
+               <part name="MORELINK"><![CDATA[<p>&raquo;
+<a href="<%itemlink%>#more" title="Read more on &#39;<%title(attribute)%>&#39;">Read More</a>
 </p>]]></part>
 
-       <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
+               <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
 
-       <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></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>
+               <part name="SEARCH_NOTHINGFOUND"><![CDATA[No search results found for <b><%query%></b>]]></part>
 
-</template>
+       </template>
 
 
-<template name="default/item">
-
-<description>Nucleus CMS default item template</description>
-
-       <part name="COMMENTS_BODY"><![CDATA[<div class="itemcomment id<%memberid%>">
+       <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>
@@ -335,25 +321,25 @@ title="<%ip%> | Click to visit <%user%>'s website or send an email">
 </div>
 </div>]]></part>
 
-       <part name="COMMENTS_MANY"><![CDATA[comments]]></part>
+               <part name="COMMENTS_MANY"><![CDATA[comments]]></part>
 
-       <part name="COMMENTS_NONE"><![CDATA[<div class="comments">No comments yet</div>]]></part>
+               <part name="COMMENTS_NONE"><![CDATA[<div class="comments">No comments yet</div>]]></part>
 
-       <part name="COMMENTS_ONE"><![CDATA[comment]]></part>
+               <part name="COMMENTS_ONE"><![CDATA[comment]]></part>
 
-       <part name="EDITLINK"><![CDATA[<div class="contentitem4">
+               <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_DATE"><![CDATA[%m/%d]]></part>
 
-       <part name="FORMAT_TIME"><![CDATA[%X]]></part>
+               <part name="FORMAT_TIME"><![CDATA[%X]]></part>
 
-       <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
+               <part name="IMAGE_CODE"><![CDATA[<%image%>]]></part>
 
-       <part name="ITEM"><![CDATA[<div class="contenttitle">
+               <part name="ITEM"><![CDATA[<div class="contenttitle">
 <h2><%date%>: <%title(raw)%></h2>
 </div>
 <div class="contentitem">
@@ -374,14 +360,15 @@ Posted by: <a href="<%authorlink%>" title="Author: <%author%>"><%author%></a>
 <a name="more"></a><%more%>
 </div>]]></part>
 
-       <part name="LOCALE"><![CDATA[en]]></part>
+               <part name="LOCALE"><![CDATA[en]]></part>
+
+               <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
 
-       <part name="MEDIA_CODE"><![CDATA[<%media%>]]></part>
+               <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
 
-       <part name="POPUP_CODE"><![CDATA[<%popuplink%>]]></part>
+               <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>
 
-       <part name="SEARCH_HIGHLIGHT"><![CDATA[<span class="highlight">\0</span>]]></part>
+       </template>
 
-</template>
 
 </nucleusskin>

diff --git a/skins/rsd/skinbackup.xml b/skins/rsd/skinbackup.xml
index 73fe5ad..5799d6f 100755 (executable)
--- a/skins/rsd/skinbackup.xml
+++ b/skins/rsd/skinbackup.xml
@@ -1,9 +1,9 @@
 <nucleusskin>
        <meta>
                <skin name="xml/rsd" />
+               <info><![CDATA[RSD (Really Simple Discovery) information for weblog clients]]></info>
        </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"?>
@@ -14,16 +14,14 @@
   <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>
+    <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>
+    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>
    </api>
   </apis>
  </service>
 </rsd>]]></part>
-
        </skin>
 
-
-</nucleusskin>
\ No newline at end of file
+</nucleusskin>

diff --git a/skins/rss2.0/skinbackup.xml b/skins/rss2.0/skinbackup.xml
index 696d489..77bc0e0 100755 (executable)
--- a/skins/rss2.0/skinbackup.xml
+++ b/skins/rss2.0/skinbackup.xml
@@ -2,9 +2,9 @@
        <meta>
                <skin name="feeds/rss20" />
                <template name="feeds/rss20" />
+               <info><![CDATA[RSS 2.0 syndication of weblogs]]></info>
        </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"?>
@@ -13,10 +13,9 @@
     <title><%blogsetting(name)%></title>
     <link><%blogsetting(url)%></link>
     <description><%blogsetting(desc)%></description>
-    <!-- optional tags -->
-    <language>ja</language>           <!-- valid langugae goes here -->
+    <language>ja</language>
     <generator><%version%></generator>
-       <copyright>&#169;</copyright>             <!-- Copyright notice -->
+    <copyright>&#169;</copyright>
     <category>Weblog</category>
     <docs>http://backend.userland.com/rss</docs>
     <image>
@@ -27,29 +26,25 @@
     <%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>
+<title><![CDATA[<%title(xml)%>]]]]><![CDATA[></title>
+<link><%blogurl%>?itemid=<%itemid%></link>
 <description><![CDATA[<%body%><%more%>]]]]><![CDATA[></description>
- <category><%category%></category>
+<category><%category%></category>
 <comments><%blogurl%>?itemid=<%itemid%></comments>
- <pubDate><%date(rfc822)%></pubDate>
+<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>
+               <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
+       </template>
+</nucleusskin>