# HG changeset patch
# User Dan
# Date 1228754145 18000
# Node ID 42d8ae8f6f714d6a280b37b13057d5ea1e3488e4
# Parent  7db1682938e823445f6166869ef66b5e29934755
Revert to 1.0.x (code will be branched) + updates for Ferrishyn; added search bar to header

diff -r 7db1682938e8 -r 42d8ae8f6f71 themes/connections/acledit.tpl
--- a/themes/connections/acledit.tpl	Mon Dec 08 10:48:19 2008 -0500
+++ b/themes/connections/acledit.tpl	Mon Dec 08 11:35:45 2008 -0500
@@ -1,19 +1,17 @@
 <!-- VAR acl_field_begin -->
-<div class="tblholder">
+<div class="tblholder" style="padding: 0px;">
   <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('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>
+      <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>
     </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>
@@ -22,8 +20,14 @@
 <!-- ENDVAR acl_field_item -->
 <!-- VAR acl_field_end -->
     <tr>
-      <td colspan="6" class="row3">
-        {lang:acl_lbl_help}
+      <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>
     </tr>
   </table>
diff -r 7db1682938e8 -r 42d8ae8f6f71 themes/connections/comment.tpl
--- a/themes/connections/comment.tpl	Mon Dec 08 10:48:19 2008 -0500
+++ b/themes/connections/comment.tpl	Mon Dec 08 11:35:45 2008 -0500
@@ -1,33 +1,26 @@
-<div class="tblholder">
+<div class="mdg-comment tblholder" style="padding: 0px;">
   <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<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
+      <td style="width: 120px; height: 100%;" rowspan="4" valign="top" class="row1">
         <table border="0" width="100%" style="height: 100%;" cellspacing="0" cellpadding="0">
           <tr>
-            <td valign="top" class="row1<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
+            <td valign="top" class="row1">
               <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<!-- BEGIN is_friend --> row1_green<!-- END is_friend --><!-- BEGIN is_foe --> row1_red<!-- END is_foe -->">
+            <td valign="bottom" class="row1">
               {SEND_PM_LINK} {ADD_BUDDY_LINK}
             </td>
           </tr>
         </table>
       </td>
       <td class="row2">
-        <b>{lang:comment_lbl_subject}</b> <span id="subject_{ID}">{SUBJECT}</span>
+        <b>Subject:</b> <span id="subject_{ID}">{SUBJECT}</span>
       </td>
     </tr>
     <tr>
@@ -49,7 +42,7 @@
     <!-- BEGIN auth_mod -->
     <tr>
       <td class="row1">
-        <b>{lang:comment_lbl_mod_options}</b> {MOD_APPROVE_LINK} {MOD_DELETE_LINK} | {MOD_IP_LINK}
+        <b>Moderation options:</b> {MOD_APPROVE_LINK} {MOD_DELETE_LINK}
       </td>
     </tr>
     <!-- END auth_mod -->
diff -r 7db1682938e8 -r 42d8ae8f6f71 themes/connections/css/default.css
--- a/themes/connections/css/default.css	Mon Dec 08 10:48:19 2008 -0500
+++ b/themes/connections/css/default.css	Mon Dec 08 11:35:45 2008 -0500
@@ -32,13 +32,11 @@
 	color: #753206;
 	text-decoration:underline;
 }
-input, textarea 
-{
+input, textarea {
 	background: #F3F6ED;
 	border: #E1D6C6 1px solid;
 }
-#rap 
-{
+#rap {
 	background:#fff url(../img/rap.jpg) center repeat-y;
 	width:760px;
 	margin:0 auto;
@@ -55,8 +53,7 @@
 	padding:0;
 	border:#fc9 0px solid;
 }
-#main 
-{
+#main {
 	margin:0 auto;
 	padding:0;
 	background:url(../img/content_bg.gif) repeat;
@@ -190,8 +187,7 @@
   padding: 4px;
   text-decoration: none;
 }
-#pagenav
-{
+#pagenav {
 	list-style:none;
 }
 #sidebar ul li {
@@ -219,8 +215,7 @@
 	background:none;
 	border:none;
 }
-#sidebar ul ul li 
-{
+#sidebar ul ul li {
 	margin:0;
 	padding:0;
 	padding-left:10px;
@@ -239,32 +234,26 @@
 #content p {
   margin-left: 1em;
 }
-.post , .page
-{
+.post, .page {
 	margin:0 0 30px 0;
 }
-.page 
-{
+.page {
 	margin:25px -5px 0 27px;
 }
-.post-info, .page-info 
-{
+.post-info, .page-info {
 	font-size:0.85em;
 	font-family: Verdana, Arial, Sans-Serif;
 	margin:0;
 	padding:0;
 	color:#333;
 }
-.page-info 
-{
+.page-info {
 	text-align:center;	
 }
-.post-info a
-{
+.post-info a {
 	color:#990000;
 }
-.post-info a:hover 
-{
+.post-info a:hover {
 	color:#000;
 }
 .post-content, .page-content {
@@ -283,13 +272,11 @@
 	margin:0;
 	font-weight:bold;
 }
-.page-title 
-{
+.page-title {
 	font-size:1.6em;
 	font-weight:normal;
 }
-#content .page-title a, .post-title a:link, .post-title a:visited, .post-title a:hover, .post-title a:active
-{
+#content .page-title a, .post-title a:link, .post-title a:visited, .post-title a:hover, .post-title a:active {
 	text-decoration:none;
 	color:#676E04;
 }
@@ -322,16 +309,14 @@
 	width:740px;
 }
 #footer a {
-border:none;
-color:#7A7636;
+  border: none;
+  color: #7A7636;
 }
-
 .commentlist {
 	font-size:1em;
 	font-weight:normal;	
 }
-#commentform 
-{
+#commentform {
 	margin:0 0 0 40px;
 }
 #commentform textarea {
@@ -346,19 +331,16 @@
 	color: #676E04;
 	font: 0.9em verdana, helvetica, sans-serif;
 }
-.commentlist li 
-{
+.commentlist li {
 	margin:5px 0;
 	padding:10px 10px 20px 10px;
 	background:#F3F6ED url(../img/comments_bottom.jpg) repeat-x bottom;
 	border:#E1D6C6 1px solid;
 }
-.commentlist .alt 
-{
+.commentlist .alt {
 
 }
-#topnav 
-{
+#topnav {
 	list-style:none;
 	font-size:0.9em;
 	margin:0;	
@@ -366,17 +348,17 @@
 	text-align:right;	
 	font-family:Verdana, Arial, Sans-Serif;
 }
-#topnav li 
-{
-	list-style:none;
-	display:inline;
-	padding:0;
-	margin:0;
-	font-weight:bold;
+#topnav li {
+	list-style: none;
+	display: inline;
+	padding: 0;
+	margin: 0;
+	font-weight: bold;
+  position: relative;
+  top: -2px;
 }
 
-#topnav li.sep 
-{
+#topnav li.sep {
 	margin-left: 3px;
   margin-right: 3px;
   margin-top: 1px;
@@ -387,56 +369,43 @@
   border-right: 1px solid #F7F3ED;
 }
 
-#topnav li a:link, #topnav li a:visited
-{
-	text-decoration:none;	
-	color:#BBC4A3;
-  border-left: 1px solid #7D8B5A;
-  border-right: 1px solid #7D8B5A;
+#topnav li a:link, #topnav li a:visited, #topnav li input[type ~="submit"], #topnav li input[type ~="button"], #topnav li button {
+	text-decoration: none;	
+	color: #BBC4A3;
+  border-width: 0 1px;
+  border-style: solid;
+  border-color: #7D8B5A;
   background-color: #7D8B5A;
   padding: 3px;
   margin: 0;
 }
-#topnav li a:hover, #topnav li a:focus
-{
+#topnav li form {
+  margin: 0;
+  padding: 0;
+  display: inline;
+}
+#topnav li input[type ~="submit"], #topnav li input[type ~="button"], #topnav li button {
+  font-size: 1em;
+  cursor: pointer;
+}
+#topnav li input[type ~="text"] {
+  padding: 2px 2px 3px 2px;
+  background-color: #BBC4A3;
+  border-color: #F7F3ED;
+  color: #5D7B3A;
+  margin: 0 4px;
+}
+#topnav li input[type ~="text"]:focus {
+  color: #1c1010;
+}
+#topnav li a:hover, #topnav li a:focus, #topnav li input[type ~="submit"]:hover, #topnav li input[type ~="button"]:hover, #topnav li button:hover, #topnav li input[type ~="submit"]:focus, #topnav li input[type ~="button"]:focus, #topnav li button:focus {
 	color:#F7F3ED;
-  border-left: 1px solid #F7F3ED;
-  border-right: 1px solid #F7F3ED;
+  border-color: #F7F3ED;
   background-color: #BBC4A3;
-  padding-left: 3px;
-  padding-right: 3px;
-  padding-top: 3px;
-  padding-bottom: 5px;
+  /* padding: 3px 3px 5px 3px; */
   margin: 0;
 }
 
-div.jswindow {  font-family: Trebuchet MS, tahoma, verdana, arial, sans-serif; font-size: 9pt; display: none; position: absolute; list-style-type: none;
-	padding: 2px;
-	margin: 0;
-  margin-top: 7px;
-	font-size: 0.9em;	
-	border:#E1D6c6 1px solid;
-  background:#F3F6ED;
-	}
-div.titlebar { font-family: Trebuchet MS, tahoma, verdana, arial, sans-serif; font-size: 9pt; cursor: default; 	margin: 0 0 0 0;
-	padding:2px;
-  margin: 2px;
-  
-	font-size: 1em;
-	color: #676E04;
-	text-align:center;
-	background: #e2ebda;
-	border:0px solid #ccc;
-	height:22px;
-	font-weight:bold; }
-div.titlebar div.closebtn       { width: 16px; height: 16px; background-color: #e2ebda; display: block; }
-div.titlebar div.closebtn:hover { width: 16px; height: 16px; background-color: #F3F6ED; display: block; }
-
-div.titlebar table, div.titlebar td { margin: 0; padding: 0; }
-div.jswindow div.content { padding: 5px;
-  overflow: hidden;   
-  }
-
 div.pagebar                { background-color: #F3F6ED; margin-top: 0px; padding: 3px; font-size: 7pt; text-align: left; font-family: arial, helvetica, sans-serif; }
 div.pagebar a              { cursor: pointer; padding: 3px; margin-left: 3px; margin-right: 3px; text-decoration: none; color: #909D73; } 
 div.pagebar a:hover        { cursor: pointer; padding: 3px; margin-left: 3px; margin-right: 3px; text-decoration: none; color: #990000; background-color: #BBC4A3; }
diff -r 7db1682938e8 -r 42d8ae8f6f71 themes/connections/footer.tpl
--- a/themes/connections/footer.tpl	Mon Dec 08 10:48:19 2008 -0500
+++ b/themes/connections/footer.tpl	Mon Dec 08 11:35:45 2008 -0500
@@ -22,7 +22,7 @@
       
         <p id="footer">
           {COPYRIGHT}<br />
-          Powered by <a href="http://enano.homelinux.org">Enano</a>  |  Theme by <a href="http://www.vanillamist.com/">Patricia Muller</a>  |  <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.1</a>  |  <a href="http://jigsaw.w3.org/css-validator/validator?profile=css2&amp;warning=2&amp;uri={REQUEST_URI}">Valid CSS</a>  |  [[Stats]]
+          Powered by <a href="<!-- BEGIN stupid_mode -->http://enanocms.org/<!-- BEGINELSE stupid_mode -->{URL_ABOUT_ENANO}<!-- END stupid_mode -->">Enano</a>  |  Theme by <a href="http://www.vanillamist.com/">Patricia Muller</a>  |  <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.1</a>  |  <a href="http://jigsaw.w3.org/css-validator/validator?profile=css2&amp;warning=2&amp;uri={REQUEST_URI}">Valid CSS</a>  |  [[Stats]]
         </p>
         </div>
       </div> <!-- div rap -->
diff -r 7db1682938e8 -r 42d8ae8f6f71 themes/connections/header.tpl
--- a/themes/connections/header.tpl	Mon Dec 08 10:48:19 2008 -0500
+++ b/themes/connections/header.tpl	Mon Dec 08 11:35:45 2008 -0500
@@ -12,28 +12,24 @@
   </head>
   <body>
     
-    <div id="root1" class="jswindow">
-      <div id="tb1" class="titlebar">Confirm Logout</div>
-      <div class="content" id="cn1">
-        <form action="{CONTENTPATH}Special:Logout" method="get">
-          <div style="text-align: center">
-            <h3>Are you sure you want to log out?</h3>
-            <input type="submit" value="Log out" style="font-weight: bold;" />  <input type="button" onclick="jws.closeWin('root1');" value="Cancel" />
-          </div>
-        </form>
-      </div>  
-    </div>
-    <div id="root2" class="jswindow">
-      <div id="tb2" class="titlebar">Change style</div>
-      <div class="content" id="cn2">
-        If you can see this text, it means that your browser does not support Cascading Style Sheets (CSS). CSS is a fundemental aspect of XHTML, and as a result it is becoming very widely adopted by websites, including this one. You should consider switching to a more modern web browser, such as Mozilla Firefox or Opera 9.
-      </div>  
-    </div>
-    
     <div id="rap">
       <div id="header">
         <ul id="topnav">
-          <li>&nbsp;</li>
+          <!-- Put any additional navigation links here within list elements. -->
+          <!-- Example: <li><a href="{SCRIPTPATH}/{ADMIN_SID_AUTO}">Home</a></li> -->
+          <!-- You can insert a separator with: -->
+          <!-- <li class="sep"></li> -->
+          <li>
+            <form action="{SCRIPTPATH}/index.php" method="get" onsubmit="if ( this.q.value == 'search' ) return false;">
+              <input type="hidden" name="title" value="{NS_SPECIAL}Search" />
+              <input type="hidden" name="auth" value="{ADMIN_SID_RAW}" />
+              <input type="text" name="q" value="search" 
+                onfocus="if ( this.value == 'search' ) this.value = '';"
+                onblur=" if ( this.value == '' ) this.value = 'search';"
+                />
+              <input type="submit" value="Go" />
+            </form>
+          </li>
         </ul>
         <h1><a href="{CONTENTPATH}" title="{SITE_NAME}">{SITE_NAME}</a></h1>
         <div id="desc">{PAGE_NAME}</div>