# HG changeset patch
# User Dan
# Date 1208089815 14400
# Node ID 264ab53232f4a8c99af0535b6d768deae0d13216
# Parent  63cca091dd0a75a7e68ee82a3e2f55d26d5f7829
Several updates for 1.1.x compatibility. Probably breaks 1.0.x compatibility.

diff -r 63cca091dd0a -r 264ab53232f4 themes/connections/acledit.tpl
--- a/themes/connections/acledit.tpl	Wed Jun 13 22:35:02 2007 -0400
+++ b/themes/connections/acledit.tpl	Sun Apr 13 08:30:15 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 63cca091dd0a -r 264ab53232f4 themes/connections/comment.tpl
--- a/themes/connections/comment.tpl	Wed Jun 13 22:35:02 2007 -0400
+++ b/themes/connections/comment.tpl	Sun Apr 13 08:30:15 2008 -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 63cca091dd0a -r 264ab53232f4 themes/connections/css/default.css
--- a/themes/connections/css/default.css	Wed Jun 13 22:35:02 2007 -0400
+++ b/themes/connections/css/default.css	Sun Apr 13 08:30:15 2008 -0400
@@ -452,12 +452,12 @@
   margin: 0px 7px 0px 8px;
 }
 
-div.menu {
+div.menu, div.menu_nojs {
   background-color: #F3F6ED;
   font-size: 7pt;
   border-width: 0;
 }
-div.menu a, div.menu div.label {
+div.menu a, div.menu_nojs a, div.menu div.label, div.menu_nojs div.label {
   padding: 2.5pt 5px;
   margin-right: 3px;
   text-decoration: none;
@@ -465,51 +465,51 @@
   float: left;
   color: #909D73;
 }
-div.menu div.label {
+div.menu div.label, div.menu_nojs div.label {
   color: #201000;
   cursor: default;
 }
-div.menu span.sep {
+div.menu span.sep, div.menu_nojs span.sep {
   display: block;
   float: left;
   width: 5px;
 }
-div.menu div.multopts {
+div.menu div.multopts, div.menu_nojs div.multopts {
   line-height: 17pt;
 }
-div.menu div.multopts a, div.menu div.multopts div.label {
+div.menu div.multopts a, div.menu_nojs div.multopts a, div.menu div.multopts div.label, div.menu_nojs div.multopts div.label {
   float: none;
   display: inline;
 }
-div.menu a.liteselected, div.menu a.liteselected:hover, div.menu a:hover {
+div.menu a.liteselected, div.menu_nojs a.liteselected, div.menu a.liteselected:hover, div.menu_nojs a.liteselected:hover, div.menu a:hover, div.menu_nojs a:hover {
   color: #990000;
   background-color: #BBC4A3;
 }
-div.menu input[type ^="text"], div.menu input[type ^="password"] {
+div.menu input[type ^="text"], div.menu_nojs input[type ^="text"], div.menu input[type ^="password"], div.menu_nojs input[type ^="password"] {
   border-width: 0;
   font-size: 9pt;
   padding: 4px 5px;
   max-width: 70px;
   background-color: #E3E6DD;
 }
-div.menu input[type ^="text"]:hover, div.menu input[type ^="password"]:hover {
+div.menu input[type ^="text"]:hover, div.menu_nojs input[type ^="text"]:hover, div.menu input[type ^="password"]:hover, div.menu_nojs input[type ^="password"]:hover {
   background-color: #ECEFF6;
 }
-div.menu input[type ^="text"]:focus, div.menu input[type ^="password"]:focus {
+div.menu input[type ^="text"]:focus, div.menu_nojs input[type ^="text"]:focus, div.menu input[type ^="password"]:focus, div.menu_nojs input[type ^="password"]:focus {
   background-color: #FAFDF6;
 }
-div.menu input[type ^="button"], div.menu input[type ^="submit"] {
+div.menu input[type ^="button"], div.menu_nojs input[type ^="button"], div.menu input[type ^="submit"], div.menu_nojs input[type ^="submit"] {
   border-width: 0;
   font-size: 9pt;
   padding: 3px 5px;
   max-width: 70px;
 }
-div.menu a.current, div.menu a.current:hover, div.menu a.selected, div.menu a.selected:hover {
+div.menu a.current, div.menu_nojs a.current, div.menu a.current:hover, div.menu_nojs a.current:hover, div.menu a.selected, div.menu_nojs a.selected, div.menu a.selected:hover, div.menu_nojs a.selected:hover {
   color: #400000;
   background-color: transparent;
   background-image: url(../img/content_bg.gif);
 }
-div.menu ul {
+div.menu ul, div.menu_nojs ul {
   display: none;
   position: absolute;
   padding: 0;
@@ -518,10 +518,10 @@
   border-width: 0;
   min-width: 120px;
 }
-div.menu ul li {
+div.menu ul li, div.menu_nojs ul li {
   list-style: none;
 }
-div.menu ul a {
+div.menu ul a, div.menu_nojs ul a {
   float: none;
   margin: 0;
 }
@@ -534,15 +534,15 @@
   display: block;
 }
 
-.mdg-comment { margin: 0; margin-left: 0.2in; padding: 10px; border: 1px #E1D6C6 solid; margin-bottom: 10px; }
-.tblholder   { margin: 0; margin-left: 0.2in; padding: 0px;  border: 1px #E1D6C6 solid; margin-bottom: 10px; }
+.mdg-comment { margin: 0; margin-left: 0.2in; padding: 10px; border: 1px #E1D6C6 solid; margin-bottom: 10px; background-color: #F3F6ED; }
+.tblholder   { margin: 0; margin-left: 0.2in; padding: 0px;  border: 1px #E1D6C6 solid; margin-bottom: 10px; background-color: #F3F6ED; }
 
-.tblholder th      { padding: 4px; background-color: #C8D6A3 !important; color: #696E5B !important; }
-.tblholder td.row1 { padding: 4px; background-color: #E3E6DD !important; }
-.tblholder td.row2 { padding: 4px; background-color: #F3F6ED !important; }
-.tblholder td.row3 { padding: 4px; background-color: #EBEDE6 !important; }
-.tblholder table   { background-color: #FFFFFF; }
-.tblholder th.subhead { padding: 4px; background-color: #D0D4C7 !important; color: #696E5B !important; }
+.tblholder th        , .mdg-comment th         { padding: 4px; background-color: #C8D6A3 !important; color: #696E5B !important; }
+.tblholder td.row1   , .mdg-comment td.row1    { padding: 4px; background-color: #E3E6DD !important; }
+.tblholder td.row2   , .mdg-comment td.row2    { padding: 4px; background-color: #F3F6ED !important; }
+.tblholder td.row3   , .mdg-comment td.row3    { padding: 4px; background-color: #EBEDE6 !important; }
+.tblholder table     , .mdg-comment table      { background-color: #FFFFFF; }
+.tblholder th.subhead, .mdg-comment th.subhead { padding: 4px; background-color: #D0D4C7 !important; color: #696E5B !important; }
 
 .catCheck       { padding: 3px; }
 .catCheck:hover { padding: 3px; background-color: #F3F6ED; }
diff -r 63cca091dd0a -r 264ab53232f4 themes/connections/footer.tpl
diff -r 63cca091dd0a -r 264ab53232f4 themes/connections/sidebar-editor.tpl
diff -r 63cca091dd0a -r 264ab53232f4 themes/connections/toolbar.tpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/connections/toolbar.tpl	Sun Apr 13 08:30:15 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 -->