# HG changeset patch
# User Dan
# Date 1243622183 14400
# Node ID deac853bf428c2da46d47ba22a99157329a99780
# Parent  faec0613893322235e4898a9113517dcf07a8de1
Updated to 1.1.6 compatibility

diff -r faec06138933 -r deac853bf428 themes/springy/acledit.tpl
--- a/themes/springy/acledit.tpl	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/acledit.tpl	Fri May 29 14:36:23 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 faec06138933 -r deac853bf428 themes/springy/comment.tpl
--- a/themes/springy/comment.tpl	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/comment.tpl	Fri May 29 14:36:23 2009 -0400
@@ -4,23 +4,30 @@
       <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 faec06138933 -r deac853bf428 themes/springy/footer.tpl
--- a/themes/springy/footer.tpl	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/footer.tpl	Fri May 29 14:36:23 2009 -0400
@@ -11,5 +11,6 @@
       </div>
       <div class="copyright-bottom"></div>
     </div>
+    {JS_FOOTER}
   </body>
 </html>
diff -r faec06138933 -r deac853bf428 themes/springy/header.tpl
--- a/themes/springy/header.tpl	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/header.tpl	Fri May 29 14:36:23 2009 -0400
@@ -6,10 +6,9 @@
     <link rel="stylesheet" type="text/css" href="{SCRIPTPATH}/includes/clientside/css/enano-shared.css" />
     <link id="mdgCss" rel="stylesheet" href="{SCRIPTPATH}/themes/{THEME_ID}/css/{STYLE_ID}.css" type="text/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}
     <script type="text/javascript">
-      if ( !IE )
+      if ( !(/msie/i).test(window.navigator.userAgent) )
         document.write('<link rel="stylesheet" href="{SCRIPTPATH}/themes/{THEME_ID}/css-global/for-mozillas-eyes-only.css" type="text/css" />');
     </script>
     {ADDITIONAL_HEADERS}
diff -r faec06138933 -r deac853bf428 themes/springy/js/navi.js
--- a/themes/springy/js/navi.js	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/js/navi.js	Fri May 29 14:36:23 2009 -0400
@@ -4,7 +4,7 @@
     var top = getScrollOffset();
   else
     var top = 0;
-  top += ( IE ? 4 : $('right-sidebar-trigger').Top() ) + $('right-sidebar-trigger').Height();
+  top += ( IE ? 4 : $dynano('right-sidebar-trigger').Top() ) + $dynano('right-sidebar-trigger').Height();
   var thediv = document.getElementById('right-sidebar');
   thediv.style.position = ( IE ) ? 'absolute' : 'fixed';
   thediv.style.top = top + 'px';
@@ -31,7 +31,7 @@
   if ( getWidth() < 1084 )
   {
     // small window, so move the main divs over to the left to make use of that padded area
-    $('mainholder').object.style.margin = '0';
+    $dynano('mainholder').object.style.margin = '0';
   }
 }
 
@@ -48,7 +48,7 @@
       break;
     }
   }
-  $('mainholder').object.style.margin = '0 auto';
+  $dynano('mainholder').object.style.margin = '0 auto';
 }
 
 function sidebar_right_toggle()
diff -r faec06138933 -r deac853bf428 themes/springy/preview.png
Binary file themes/springy/preview.png has changed
diff -r faec06138933 -r deac853bf428 themes/springy/toolbar.tpl
--- a/themes/springy/toolbar.tpl	Tue Dec 18 19:23:33 2007 -0500
+++ b/themes/springy/toolbar.tpl	Fri May 29 14:36:23 2009 -0400
@@ -1,5 +1,6 @@
 <!-- Stuff related to toolbars and clickable buttons.
-     Used mostly in the page toolbar on most pages.
+     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 -->
@@ -9,9 +10,21 @@
 <!-- VAR toolbar_button -->
   <li>
     <a title="{TITLE}" {FLAGS}>
-      <img alt="{TITLE}" src="{IMAGE}" />
+      <!-- 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 -->
-      <span>{TITLE}</span>
+        <!-- BEGIN no_image -->
+          <span class="noimage">{TITLE}</span>
+        <!-- BEGINELSE no_image -->
+          <span>{TITLE}</span>
+        <!-- END no_image -->
       <!-- END show_title -->
     </a>
   </li>