Index: category.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/category.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- category.html       25 Mar 2005 09:28:29 -0000      1.21
+++ category.html       29 Mar 2005 09:51:43 -0000      1.22
@@ -40,7 +40,7 @@
 <div class="clear">
 <%loop category_loop%>
   <%~set splitmod = $row_num % $split%>
-  <%~if row_num == 1 or splitmod == 1%><dl><%endif%>
+  <%~if row_num == 1 or splitmod == 1 or split == 1%><dl><%endif%>
 <%~include subcategory.html%>
   <%~if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
 <%~endloop%>
Index: home.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/home.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- home.html   25 Mar 2005 09:28:29 -0000      1.13
+++ home.html   29 Mar 2005 09:51:43 -0000      1.14
@@ -21,7 +21,7 @@
 <div class="clear">
 <%loop category_loop%>
   <%~set splitmod = $row_num % $split%>
-  <%~if row_num == 1 or splitmod == 1%><dl><%endif%>
+  <%~if row_num == 1 or splitmod == 1 or split == 1%><dl><%endif%>
 <%~include subcategory.html%>
   <%~if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
 <%~endloop%>
Index: include_common_head.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_common_head.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- include_common_head.html    22 Mar 2005 07:36:03 -0000      1.4
+++ include_common_head.html    4 Apr 2005 22:29:09 -0000       1.5
@@ -2,3 +2,28 @@
 <%if Meta_Description%><meta name="description" content="<%Meta_Description%>" /><%endif%>
 <%if Meta_Keywords%><meta name="keywords" content="<%Meta_Keywords%>" /><%endif%>
 <%if theme%><link type="text/css" rel="stylesheet" media="screen" href="<%config.build_static_url%>/<%t%>/<%theme%>.css" /><%endif%>
+<%~-- If your site is statically built, then the login status will always say 'Login/Register'.  This javascript replaces it with 'Logout' if the user is logged in. --~%>
+<%if not d and not user.Username~%>
+<script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script>
+<script type="text/javascript">
+  //<![CDATA[
+registerEvent(window, 'onload', function () {
+    var loginbar = document.getElementById('loginbar');
+    if (!loginbar)
+        return;
+    var loginlink = loginbar.firstChild;
+    if (loginlink.className != 'out')
+        return;
+    var cookies = document.cookie.split(';');
+    for (var i = 0; i < cookies.length; i++) {
+        if (cookies[i].match(/<%config.user_cookie_prefix%>s=[0-9a-f]+/)) {
+            loginlink.href = '<%config.db_cgi_url%>/user.cgi?logout=1';
+            loginlink.className = 'in';
+            loginlink.firstChild.nodeValue = 'Logout';
+            break;
+        }
+    }
+});
+  //]]>
+</script>
+<%~endif%>
Index: include_header.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_header.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- include_header.html 26 Mar 2005 00:41:18 -0000      1.10
+++ include_header.html 1 Apr 2005 02:54:08 -0000       1.11
@@ -15,7 +15,7 @@
     <%if config.bookmark_enabled%><li><a href="<%config.db_cgi_url%>/bookmark.cgi">Bookmarks</a></li><%endif%>
     <%if Links::Utils::is_editor%><li><a href="<%config.db_cgi_url%>/browser.cgi">Editors</a></li><%endif%>
   </ul>
-  <%if secondarynav%><%include $secondarynav%><%endif~%>
+  <%~if secondarynav%><%include $secondarynav%><%endif%>
 </div>
 <div class="searchbar">
   <form action="<%config.db_cgi_url%>/search.cgi">
Index: jump_frame.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/jump_frame.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jump_frame.html     22 Mar 2005 02:01:36 -0000      1.5
+++ jump_frame.html     7 Apr 2005 07:50:05 -0000       1.6
@@ -7,7 +7,7 @@
 </head>
 <body id="jump_frame">
   <div class="jumpwrapper">
-    <a href="<%config.build_root_url%>"><img src="<%Links::Utils::image_url('logo-small.gif')%>" alt="<%site_title%>" class="floatleft" /></a>
+    <a href="<%config.build_root_url%>"><img src="<%Links::Utils::image_url('logo-small.gif')%>" class="jumplogo" alt="<%site_title%>" /></a>

   <%if error%>
     <p class="errormessage">
Index: language.txt
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/language.txt,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -r1.13 -r1.16
--- language.txt        16 Mar 2005 02:12:16 -0000      1.13
+++ language.txt        4 Apr 2005 22:39:55 -0000       1.16
@@ -49,7 +49,7 @@
        'FILE_TABLEFORMAT' => 'Table name for request improperly formed or possibly insecure.',
        'FILE_UNKNOWN' => 'Unknown File requested.',
        'GENERAL_BANNED' => 'Your host has been banned; please contact the site owner for details.',
-       'GENERAL_DISABLED' => 'The site is down for maintenance, please try back shortly.',
+       'GENERAL_DISABLED' => 'The site is down for maintenance, please try again shortly.',
        'GENERAL_ERROR' => 'An error has occurred.',
        'JUMP_INVALIDID' => 'Unable to find link with id: \'%s\'.',
        'LINKS_ADD' => 'Add a Link',
@@ -79,9 +79,9 @@
        'MODIFY_BADSTATUS' => 'Your link could not be modified because it is not accessible: %s.',
        'MODIFY_BADURL' => 'We were unable to find the URL \'%s\' in the database.  Please make sure you typed it in exactly as it appears in the directory.',
        'MODIFY_NOCATEGORY' => 'You did not specify a category for this link.',
-       'MODIFY_NOLINKS' => 'Sorry, but you do not have any links to modify.',
+       'MODIFY_NOLINKS' => 'You do not have any links to modify.',
        'MODIFY_NOTOWNER' => 'You are not authorized to modify this link.',
-       'MODIFY_NOURL' => 'Did not specify a link to modify.',
+       'MODIFY_NOURL' => 'You did not specify a link to modify.',
        'MODIFY_REJECTSUB' => 'Your change has been rejected.',
        'MODIFY_SELCAT' => 'Before you can modify your link, please go to the category your link is in, or the category you want to put it in and click modify.',
        'NEWSLETTERERR_ALREADYSUB' => 'You are already subscribed to the Newsletter.',
@@ -166,13 +166,11 @@
        'USER_INVALIDSIGNUP' => 'Please fill out all fields completely.',
        'USER_INVALIDVAL' => 'Invalid validation code.',
        'USER_LOGOUT' => 'You have been successfully logged out.',
-       'USER_NAMETAKEN' => 'Sorry, the username you requested is already taken.',
-       'USER_NOEMAIL' => 'Sorry, but we couldn\'t find any user with that e-mail address.',
-       'USER_NOTVAL' => 'Sorry, that account has not yet been validated. ',
+       'USER_NAMETAKEN' => 'The username you requested is already taken.',
+       'USER_NOEMAIL' => 'No user with that e-mail address.',
+       'USER_NOTVAL' => 'This account has not yet been validated.',
        'USER_PASSSENT' => 'Your password has been successfully e-mailed to you.',
-       'USER_VALSENT' => 'Your validation code has been sent!',
-       'VAL_CANTEMAIL' => 'Unable to send validation e-mail; missing or bad e-mail address.',
-       'VAL_GENERAL' => 'Unable to validate link: %s. Reason: %s'
+       'USER_VALSENT' => 'Your validation code has been sent!'
 };