Cosmetic changes

diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index 89a0f1770668a02a6b2036e5d67238ed429d7ea5..978551a6380429050efc9f733fe3797aadadc73d 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -8,48 +8,55 @@
 
        <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
 
-       <div class="navbar">
+       <table width="100%">
+               <tr>
+                       <t:if t:value="sidebar">
+                               <td valign="top" style="width: 210px;">
+                                       <div class="sidebar">
+                                               <t:bind t:name="sidebar">
+                                                       <h2>
+                                                               <t:a t:href="$wiki/view" t:query="title">
+                                                                       <t:label t:name="title" />
+                                                               </t:a>
+                                                       </h2>
 
-               <t:a t:href="$wiki">Front Page</t:a>
-               | <t:a t:href="$wiki/articles">All Articles</t:a>
-               | <t:a t:href="$wiki/changes">Recent Changes</t:a>
-               | <t:a t:href="$wiki/random">Random Article</t:a>
+                                                       <t:html t:name="html" />
+                                               </t:bind>
+                                       </div>
+                               </td>
+                       </t:if>
 
-               <t:if t:code="furnace.auth:logged-in?">
+                       <td valign="top">
 
-                       <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                               | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
-                       </t:if>
+                               <div class="navbar">
 
-                       | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+                                       <t:a t:href="$wiki">Front Page</t:a>
+                                       | <t:a t:href="$wiki/articles">All Articles</t:a>
+                                       | <t:a t:href="$wiki/changes">Recent Changes</t:a>
+                                       | <t:a t:href="$wiki/random">Random Article</t:a>
 
-               </t:if>
+                                       <t:if t:code="furnace.auth:logged-in?">
 
-       </div>
+                                               <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
+                                                       | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                                               </t:if>
 
-       <h1><t:write-title /></h1>
+                                               | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
-       <table width="100%">
-               <tr>
-                       <td> <t:call-next-template /> </td>
-                       <t:if t:value="sidebar">
-                               <td valign="top">
-                                       <t:bind t:name="sidebar">
-                                               <h2>
-                                                       <t:a t:href="$wiki/view" t:query="title">
-                                                               <t:label t:name="title" />
-                                                       </t:a>
-                                               </h2>
-               
-                                               <t:html t:name="html" />
-                                       </t:bind>
-                               </td>
-                       </t:if>
+                                       </t:if>
+
+                               </div>
+
+                               <h1><t:write-title /></h1>
+
+                               <t:call-next-template />
+
+                       </td>
                </tr>
 
                <t:if t:value="footer">
                        <tr>
-                               <td>
+                               <td colspan="2">
                                        <t:bind t:name="footer">
                                                <small>
                                                        <t:html t:name="html" />

diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css
index 83ec918e3baac71c6313c075d97901563c88115c..67000ae63c9fbbd36b33f87a24295ab603be10b0 100644 (file)
--- a/extra/webapps/wiki/wiki.css
+++ b/extra/webapps/wiki/wiki.css
@@ -38,3 +38,10 @@
     border-width: 1px 1px 0 0;
 }
 
+.sidebar {
+    padding: 4px;
+    margin: 4px;
+    border: 1px dashed grey;
+    background: #f5f1fd;
+    width: 200px;
+}

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 5e94e4e88a13b4e5213501c129f877d3d7f5ac01..e37f7d4c3ffe1776f675169427f647343618bb3e 100644 (file)
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -84,6 +84,8 @@ SYMBOL: dh-file
     common-configuration ;
 
 : init-production ( -- )
+    f dh-file set-global
+    f key-password set-global
     "/home/slava/cert/host.pem" key-file set-global
     common-configuration ;
 

diff --git a/extra/websites/concatenative/page.css b/extra/websites/concatenative/page.css
index 49e26883adddffd84abc5615c5f0312492589b8a..8115627742ad9f7be7f778d7d66e2cd733e15336 100644 (file)
--- a/extra/websites/concatenative/page.css
+++ b/extra/websites/concatenative/page.css
@@ -32,7 +32,7 @@ a:hover, .link:hover {
 }
 
 .navbar {
-       background-color: #eee;
+       background-color: #eeeee0;
        padding: 5px;
        border: 1px solid #ccc;
 }