Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	15 Jul 2002 03:11:35 -0000	1.7
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	16 Jul 2002 21:43:12 -0000	1.8
@@ -40,15 +40,15 @@
   </tr>
 
   <tr>
-    <td width="10%" class="header-logo">
+    <td class="header-logo">
       <a href="@dotlrn_url@">
       <img class="header-img" border=0 src="@header_img_url@" alt="@header_img_alt_text@"></a>
     </td>
 
-    <td width="50%"><div class=header-text>@text@</div></td>
+    <td><div class=header-text>@text@</div></td>
 
-    <td width="40%" class="header-buttons" align="right">
-      <a href="@dotlrn_url@"><img class="header-img" border="0" src="@dotlrn_graphics_url@/myspace-@color_hack_name@.gif" width="98" height="25" alt="MySloanSpace"></a>
+    <td class="header-buttons">
+      <a href="@dotlrn_url@"><img class="header-img" border="0" src="@dotlrn_graphics_url@/myspace-@color_hack_name@.gif" width="98" height="25" alt="MySpace"></a>
       <a href="@dotlrn_url@/control-panel"><img class="header-img" border="0" src="@dotlrn_graphics_url@/help-@color_hack_name@.gif" width="67" height="25" alt="Help"></a>
       <a href="/register/logout"><img class="header-img" border="0" src="@dotlrn_graphics_url@/logout-@color_hack_name@.gif" width="62" height="25" alt="Logout"></a>
     </td>
@@ -82,4 +82,17 @@
 
 <hr>
 
-<div class="footer"><a href="http://mitsloan.mit.edu">MIT Sloan School of Management</a> | <a href="http://web.mit.edu">MIT</a></div>
+<div class="footer">
+  <table width="100%" border="0" cellpadding="1" cellspacing="0">
+    <tr>
+      <td align=left valign=top>
+        <a href="http://dotlrn.openforce.net">dotLRN</a>
+        | 
+        <a href="http://openacs.org">OpenACS</a>
+      </td>
+      <td align=right>
+        @ds_link@
+      </td>
+    </tr>
+  </table>
+</div>
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	15 Jul 2002 03:11:35 -0000	1.7
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	16 Jul 2002 21:43:12 -0000	1.8
@@ -99,7 +99,7 @@
 set header_font_size "medium"
 set header_font_color "black"
 set header_logo_item_id ""
-set header_img_url "$dotlrn_graphics_url/logowhite.gif" 
+set header_img_url "$dotlrn_graphics_url/dotlrn.gif" 
 set header_img_alt_text "Header Logo"
 
 
@@ -208,16 +208,21 @@
 .header-logo {
     color: white;
     background: white;
-    width: 100px;
+    width: 140px;
 }
 
+.header-buttons {
+    vertical-align: middle;
+    text-align: right;
+}
+
 .header-text {
     font-family: $header_font Verdana, Arial, Helvetica, sans-serif;;
     font-size: $header_font_size;
     color: $header_font_color;
     background: white;
-    width: 100px;
     white-space: nowrap;
+    padding-left: 20px;
 }
 
 table.element {
@@ -267,4 +272,17 @@
 </STYLE>
 "
 
+# Developer-support support
+set ds_enabled_p [parameter::get_from_package_key \
+    -package_key acs-developer-support \
+    -parameter EnabledOnStartupP \
+    -default 0
+]
+
+if {$ds_enabled_p} {
+    set ds_link [ds_link]
+} else {
+    set ds_link {}
+}
+
 ad_return_template