# HG changeset patch
# User Dan
# Date 1207011717 14400
# Node ID a14108b9f9324eb56e685db368523ee232c865f4
# Parent  da5928e7af093bbb47802b6f91147482ac2ccd9b
Updated for 1.1.3

diff -r da5928e7af09 -r a14108b9f932 darkritual/acledit.tpl
--- a/darkritual/acledit.tpl	Sat Jan 26 16:03:04 2008 -0500
+++ b/darkritual/acledit.tpl	Mon Mar 31 21:01:57 2008 -0400
@@ -1,17 +1,19 @@
 <!-- VAR acl_field_begin -->
-<div class="mdg-comment" style="padding: 0px;">
+<div class="tblholder">
   <table border="0" cellspacing="1" cellpadding="4" style="width: 100%;">
     <tr>
       <th></th>
-      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('1');">Deny</th>
-      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('2');">Disallow</th>
-      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('3');">Wiki mode</th>
-      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('4');">Allow</th>
+      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('i');">{lang:acl_lbl_field_inherit}</th>
+      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('1');">{lang:acl_lbl_field_deny}</th>
+      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('2');">{lang:acl_lbl_field_disallow}</th>
+      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('3');">{lang:acl_lbl_field_wikimode}</th>
+      <th style='cursor: pointer;' title="Click to change all columns" onclick="__aclSetAllRadios('4');">{lang:acl_lbl_field_allow}</th>
     </tr>
 <!-- ENDVAR acl_field_begin -->
 <!-- VAR acl_field_item -->
     <tr>
       <td class="{ROW_CLASS}">{FIELD_DESC}</td>
+      <td class="{ROW_CLASS}" style="text-align: center;"><input type="radio" value="i" name="{FIELD_NAME}" {FIELD_INHERIT_CHECKED} /></td>
       <td class="{ROW_CLASS}" style="text-align: center;"><input type="radio" value="1" name="{FIELD_NAME}" {FIELD_DENY_CHECKED} /></td>
       <td class="{ROW_CLASS}" style="text-align: center;"><input type="radio" value="2" name="{FIELD_NAME}" {FIELD_DISALLOW_CHECKED} /></td>
       <td class="{ROW_CLASS}" style="text-align: center;"><input type="radio" value="3" name="{FIELD_NAME}" {FIELD_WIKIMODE_CHECKED} /></td>
@@ -20,14 +22,8 @@
 <!-- ENDVAR acl_field_item -->
 <!-- VAR acl_field_end -->
     <tr>
-      <td colspan="5" class="row3">
-        <p><b>Permission types:</b></p>
-        <ul>
-          <li><b>Allow</b> means that the user is allowed to access the item</li>
-          <li><b>Wiki mode</b> means the user can access the item if wiki mode is active (per-page wiki mode is taken into account)</li>
-          <li><b>Disallow</b> means the user is denied access unless something allows it.</li>
-          <li><b>Deny</b> means that the user is denied access to the item. This setting overrides all other permissions.</li>
-        </ul>
+      <td colspan="6" class="row3">
+        {lang:acl_lbl_help}
       </td>
     </tr>
   </table>
diff -r da5928e7af09 -r a14108b9f932 darkritual/blog_post.tpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/darkritual/blog_post.tpl	Mon Mar 31 21:01:57 2008 -0400
@@ -0,0 +1,23 @@
+
+      <!-- Start of blog post -->
+      
+      <div class="post">
+        <div class="blog-post-header">
+          <h1><a href="{PERMALINK}">{POST_TITLE}</a></h1>
+          <p class="meta">
+            Posted by {USER_LINK} on {TIMESTAMP}
+          </p>
+        </div>
+        <div class="entry">
+          {POST_TEXT}
+        </div>
+        <p class="info">
+          <a href="{PERMALINK}#do:comments" onclick="ajaxComments();">{COMMENT_STRING}</a>
+          <!-- BEGIN auth_edit -->
+          &bull;
+          <a href="{EDIT_LINK}">Edit this post</a>
+          <!-- END auth_edit -->
+        </p>
+      </div>
+      
+      <!-- Finish blog post -->
diff -r da5928e7af09 -r a14108b9f932 darkritual/css-extra/nuggie.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/darkritual/css-extra/nuggie.css	Mon Mar 31 21:01:57 2008 -0400
@@ -0,0 +1,1 @@
+
diff -r da5928e7af09 -r a14108b9f932 darkritual/css/default.css
--- a/darkritual/css/default.css	Sat Jan 26 16:03:04 2008 -0500
+++ b/darkritual/css/default.css	Mon Mar 31 21:01:57 2008 -0400
@@ -8,6 +8,8 @@
 Feel free to use and modify but please provide credits.
 #############################################################*/
 
+@import url('../css-extra/nuggie.css');
+
 /* standard elements */
 * {
 	margin: 0;
@@ -167,6 +169,17 @@
 .footer a {color: #EEE;}
 .footer a:hover {color: #FAFCB0;}
 
+.post{margin:0 0 25px 0;}
+
+.post .info, .mdg-comment, .mdg-infobox {
+padding:2px 3px 3px 8px;
+border:1px solid #e3e4e4;
+background-color:#f5f5f5;
+font-size:0.9em;
+color:#505050;
+}
+
+
 fieldset {
   padding: 1em;
 }
diff -r da5928e7af09 -r a14108b9f932 darkritual/elements.tpl
--- a/darkritual/elements.tpl	Sat Jan 26 16:03:04 2008 -0500
+++ b/darkritual/elements.tpl	Mon Mar 31 21:01:57 2008 -0400
@@ -18,7 +18,9 @@
 <!-- ENDVAR sidebar_top -->
 <!-- VAR sidebar_section -->
             <h1>{TITLE}</h1>
-            {CONTENT}
+            <ul>
+              {CONTENT}
+            </ul>
 <!-- ENDVAR sidebar_section -->
 <!-- VAR sidebar_section_raw -->
             <h1>{TITLE}</h1>
diff -r da5928e7af09 -r a14108b9f932 darkritual/header.tpl
--- a/darkritual/header.tpl	Sat Jan 26 16:03:04 2008 -0500
+++ b/darkritual/header.tpl	Mon Mar 31 21:01:57 2008 -0400
@@ -1,22 +1,33 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
-<meta name="description" content="{SITE_DESC}"/>
-<link rel="stylesheet" type="text/css" href="{SCRIPTPATH}/includes/clientside/css/enano-shared.css" />
-<link rel="stylesheet" type="text/css" id="mdgCss" href="{SCRIPTPATH}/themes/{THEME_ID}/css/{STYLE_ID}.css" media="screen" />
-<title>{PAGE_NAME} | {SITE_NAME}</title>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+    <meta name="description" content="{SITE_DESC}"/>
+    <link rel="stylesheet" type="text/css" href="{SCRIPTPATH}/includes/clientside/css/enano-shared.css" />
+    <link rel="stylesheet" type="text/css" id="mdgCss" href="{SCRIPTPATH}/themes/{THEME_ID}/css/{STYLE_ID}.css" media="screen" />
+    <title>{PAGE_NAME} | {SITE_NAME}</title>
+    
+    {JS_DYNAMIC_VARS}
+    
+    <!-- Enable the Office2007 skin in TinyMCE -->
+    <script type="text/javascript">
+    var tinymce_skin = 'o2k7';
+    </script>
+    
+    <!-- This script automatically loads the other 15 JS files -->
+    <script type="text/javascript" src="{SCRIPTPATH}/includes/clientside/static/enano-lib-basic.js"></script>
+    {ADDITIONAL_HEADERS}
+    
+    <!-- Enable the modal page editor -->
+    <script type="text/javascript">
+    editor_use_modal_window = true;
+    tinymce_skin = 'o2k7';
+    </script>
+  
+  </head>
 
-{JS_DYNAMIC_VARS}
-    
-<!-- This script automatically loads the other 15 JS files -->
-<script type="text/javascript" src="{SCRIPTPATH}/includes/clientside/static/enano-lib-basic.js"></script>
-{ADDITIONAL_HEADERS}
-
-</head>
-
-<body>
+  <body>
 
 <div class="container">
 
diff -r da5928e7af09 -r a14108b9f932 darkritual/preview.png
Binary file darkritual/preview.png has changed
diff -r da5928e7af09 -r a14108b9f932 darkritual/toolbar.tpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/darkritual/toolbar.tpl	Mon Mar 31 21:01:57 2008 -0400
@@ -0,0 +1,56 @@
+<!-- Stuff related to toolbars and clickable buttons.
+     The plan was to use this on the toolbar for most pages. Never made it into the release,
+     but still provided as an otherwise-unused component for plugins to make use of.
+     -->
+
+<!-- VAR toolbar_start -->
+  <div class="toolbar">
+  <ul>
+<!-- ENDVAR toolbar_start -->
+<!-- VAR toolbar_button -->
+  <li>
+    <a title="{TITLE}" {FLAGS}>
+      <!-- BEGINNOT no_image -->
+      <img alt="{TITLE}" src="{IMAGE}" />
+      <!-- END no_image -->
+      <!-- BEGIN show_title -->
+        <!-- BEGIN no_image -->
+        <span class="noimage">{TITLE}</span>
+        <!-- BEGINELSE no_image -->
+        <span>{TITLE}</span>
+        <!-- END no_image -->
+      <!-- END show_title -->
+    </a>
+  </li>
+<!-- ENDVAR toolbar_button -->
+<!-- VAR toolbar_label -->
+  <li>
+    <span>{TITLE}</span>
+  </li>
+<!-- ENDVAR toolbar_label -->
+<!-- VAR toolbar_end -->
+  </ul>
+  </div>
+<!-- ENDVAR toolbar_end -->
+
+<!-- VAR toolbar_vert_start -->
+  <div class="toolbar_vert">
+  <ul>
+<!-- ENDVAR toolbar_vert_start -->
+<!-- VAR toolbar_vert_button -->
+  <li>
+    <a title="{TITLE}" {FLAGS}>
+      <img alt="{TITLE}" src="{IMAGE}" />
+      <span>{TITLE}</span>
+    </a>
+  </li>
+<!-- ENDVAR toolbar_vert_button -->
+<!-- VAR toolbar_vert_label -->
+  <li>
+    <span>{TITLE}</span>
+  </li>
+<!-- ENDVAR toolbar_vert_label -->
+<!-- VAR toolbar_vert_end -->
+  </ul>
+  </div>
+<!-- ENDVAR toolbar_vert_end -->