# HG changeset patch
# User Dan
# Date 1240183402 14400
# Node ID a3fa3b2f313fbd82c73d1555d737f9387c962153
# Parent  9fda2fa4b144be73723d5c966bb96725c2eb4efa
Updated for Enano 1.2.

diff -r 9fda2fa4b144 -r a3fa3b2f313f themes/boxart/acledit.tpl
--- a/themes/boxart/acledit.tpl	Wed Jun 13 22:35:29 2007 -0400
+++ b/themes/boxart/acledit.tpl	Sun Apr 19 19:23:22 2009 -0400
@@ -3,15 +3,17 @@
   <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 9fda2fa4b144 -r a3fa3b2f313f themes/boxart/comment.tpl
--- a/themes/boxart/comment.tpl	Wed Jun 13 22:35:29 2007 -0400
+++ b/themes/boxart/comment.tpl	Sun Apr 19 19:23:22 2009 -0400
@@ -1,26 +1,33 @@
-<div class="mdg-comment" style="padding: 0px;">
+<div class="tblholder">
   <table border="0" width="100%" cellspacing="1" cellpadding="4">
     <tr>
       <th colspan="2" style="text-align: left;">{DATETIME}</th>
     </tr>
     <tr>
-      <td style="width: 120px; height: 100%;" rowspan="4" valign="top" class="row1">
+      <td style="width: 120px; height: 100%;" rowspan="4" valign="top" class="row1<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
         <table border="0" width="100%" style="height: 100%;" cellspacing="0" cellpadding="0">
           <tr>
-            <td valign="top" class="row1">
+            <td valign="top" class="row1<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
               <b>{NAME}</b><br />
               <small>{USER_LEVEL}</small>
+              <!-- BEGIN user_has_avatar -->
+              <div class="avatar">
+                <a href="{USERPAGE_LINK}">
+                  <img alt="{AVATAR_ALT}" src="{AVATAR_URL}" style="border-width: 0px;" />
+                </a>
+              </div>
+              <!-- END user_has_avatar -->
             </td>
           </tr>
           <tr>
-            <td valign="bottom" class="row1">
+            <td valign="bottom" class="row1<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
               {SEND_PM_LINK} {ADD_BUDDY_LINK}
             </td>
           </tr>
         </table>
       </td>
       <td class="row2">
-        <b>Subject:</b> <span id="subject_{ID}">{SUBJECT}</span>
+        <b>{lang:comment_lbl_subject}</b> <span id="subject_{ID}">{SUBJECT}</span>
       </td>
     </tr>
     <tr>
@@ -42,7 +49,7 @@
     <!-- BEGIN auth_mod -->
     <tr>
       <td class="row1">
-        <b>Moderation options:</b> {MOD_APPROVE_LINK} {MOD_DELETE_LINK}
+        <b>{lang:comment_lbl_mod_options}</b> {MOD_APPROVE_LINK} {MOD_DELETE_LINK} | {MOD_IP_LINK}
       </td>
     </tr>
     <!-- END auth_mod -->
diff -r 9fda2fa4b144 -r a3fa3b2f313f themes/boxart/footer.tpl
--- a/themes/boxart/footer.tpl	Wed Jun 13 22:35:29 2007 -0400
+++ b/themes/boxart/footer.tpl	Sun Apr 19 19:23:22 2009 -0400
@@ -19,5 +19,6 @@
           
       </td></tr>
     </table>
+    {JS_FOOTER}
   </body>
 </html>
diff -r 9fda2fa4b144 -r a3fa3b2f313f themes/boxart/header.tpl
--- a/themes/boxart/header.tpl	Wed Jun 13 22:35:29 2007 -0400
+++ b/themes/boxart/header.tpl	Sun Apr 19 19:23:22 2009 -0400
@@ -6,8 +6,7 @@
     <link rel="stylesheet" type="text/css" href="{SCRIPTPATH}/includes/clientside/css/enano-shared.css" />
     <link rel="stylesheet" href="{STYLE_LINK}" type="text/css" id="mdgCss" />
     {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>
+    {JS_HEADER}
     <script type="text/javascript">
     
       function collapseSidebar(side)
diff -r 9fda2fa4b144 -r a3fa3b2f313f themes/boxart/toolbar.tpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/boxart/toolbar.tpl	Sun Apr 19 19:23:22 2009 -0400
@@ -0,0 +1,62 @@
+<!-- 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}>
+      <!-- IFSET SPRITE -->
+        {SPRITE}
+      <!-- BEGINELSE SPRITE -->
+        <!-- IFSET IMAGE -->
+          <!-- BEGINNOT no_image -->
+            <img alt="{TITLE}" src="{IMAGE}" />
+          <!-- END no_image -->
+        <!-- END IMAGE -->
+      <!-- END SPRITE -->
+      <!-- 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 -->