# HG changeset patch
# User Dan
# Date 1229040912 18000
# Node ID b2e9a6ec05474e7249dfbbafa3ea20447c844a52
# Parent  d8d8c482856ff916145cfdbfb8faac50245f4e8e# Parent  ab28d9f00fbf4f289e20637e74fcc6de9dfad32b
No changes (bad branch merge)

diff -r ab28d9f00fbf -r b2e9a6ec0547 connections/acledit.tpl
--- a/connections/acledit.tpl	Thu Dec 11 15:53:08 2008 -0500
+++ b/connections/acledit.tpl	Thu Dec 11 19:15:12 2008 -0500
@@ -1,17 +1,19 @@
 <!-- VAR acl_field_begin -->
-<div class="tblholder" 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 ab28d9f00fbf -r b2e9a6ec0547 connections/comment.tpl
--- a/connections/comment.tpl	Thu Dec 11 15:53:08 2008 -0500
+++ b/connections/comment.tpl	Thu Dec 11 19:15:12 2008 -0500
@@ -1,26 +1,33 @@
-<div class="mdg-comment tblholder" 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 ab28d9f00fbf -r b2e9a6ec0547 connections/footer.tpl
--- a/connections/footer.tpl	Thu Dec 11 15:53:08 2008 -0500
+++ b/connections/footer.tpl	Thu Dec 11 19:15:12 2008 -0500
@@ -26,5 +26,6 @@
         </p>
         </div>
       </div> <!-- div rap -->
+      {JS_FOOTER}
   </body>
 </html>
diff -r ab28d9f00fbf -r b2e9a6ec0547 connections/header.tpl
--- a/connections/header.tpl	Thu Dec 11 15:53:08 2008 -0500
+++ b/connections/header.tpl	Thu Dec 11 19:15:12 2008 -0500
@@ -6,8 +6,7 @@
     <link rel="stylesheet" type="text/css" href="{SCRIPTPATH}/includes/clientside/css/enano-shared.css" />
     <link id="mdgCss" rel="stylesheet" type="text/css" href="{SCRIPTPATH}/themes/{THEME_ID}/css/{STYLE_ID}.css" />
     {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}
     {ADDITIONAL_HEADERS}
   </head>
   <body>
@@ -35,7 +34,13 @@
         <div id="desc">{PAGE_NAME}</div>
       </div>
       <div class="menu_nojs" id="pagebar_main">
-        <div class="label">Page tools</div>
+        <div class="label">
+          <!-- BEGIN stupid_mode -->
+            Page tools
+          <!-- BEGINELSE stupid_mode -->
+            {lang:onpage_lbl_pagetools}
+          <!-- END stupid_mode -->
+        </div>
         {TOOLBAR}
         <ul>
           {TOOLBAR_EXTRAS}
diff -r ab28d9f00fbf -r b2e9a6ec0547 connections/preview.png
Binary file connections/preview.png has changed
diff -r ab28d9f00fbf -r b2e9a6ec0547 connections/theme.cfg
--- a/connections/theme.cfg	Thu Dec 11 15:53:08 2008 -0500
+++ b/connections/theme.cfg	Thu Dec 11 19:15:12 2008 -0500
@@ -12,8 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
  */
  
-global $theme;
+global $theme, $plugins;
 $theme['theme_id'] = 'connections';
 $theme['theme_name'] = 'Connections';
 
+$plugins->attachHook('compile_template', '$this->assign_bool(array("hide_search" => true));');
+
 ?>