4 files changed, 34 insertions, 3 deletions
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 17f0a23cc..afe4cf525 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -237,9 +237,21 @@ UL.tagSelection LI {
   white-space: nowrap;
 }
 
-#fullTagCloud { font-size: 140%; }
+#fullTagCloud {
+  font-size: 140%;
+  text-align: justify;
+  padding: 0;
+  margin: 1em 2em 1em 2em;
+}
 
-#fullTagCloud LI { display: inline; }
+#fullTagCloud LI {
+  display: inline;
+  white-space: nowrap;
+}
+
+#content #fullTagCloud {
+  font-size: 120%;
+}
 
 .tagLevel5 { font-size: 150%; }
 .tagLevel4 { font-size: 140%; }
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 85b91d1de..0eb4baa8e 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -90,4 +90,14 @@
 <!-- END comment -->
 <!-- END cat_infos -->
 
+<!-- BEGIN related_tags -->
+  <ul id="fullTagCloud">
+    <li>{lang:Related tags}:</li>
+    <!-- BEGIN tag -->
+    <li><a href="{related_tags.tag.URL}" class="{related_tags.tag.CLASS}" title="{related_tags.tag.TITLE}">{related_tags.tag.NAME}</a></li>
+    <!-- END tag -->
+  </ul>
+<!-- END related_tags -->
+
+
 </div> <!-- content -->
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index 696e9b128..4a687b9d5 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -57,7 +57,7 @@
 }
 
 /* quickconnect form */
-FORM#quickconnect { 
+FORM#quickconnect {
   margin: 0;
   padding: 5px;
 }
@@ -114,6 +114,11 @@ FORM#quickconnect INPUT.password {
   width: 95%;
 }*/
 
+FORM#quicksearch {
+  margin-top: 4px;
+  margin-bottom: 1px;
+}
+
 #menubar #menuTagCloud {
   text-align: center;
   margin: 5px 0;
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 1bcbbec24..983260d13 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -51,6 +51,10 @@
   <dd>
     <ul>
       <!-- BEGIN summary -->
+      <!-- BEGIN quick_search -->
+      <form action="{pwg_root}qsearch.php" method="get" id="quicksearch"><input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;"></form>
+      <script type="text/javascript">var qsearch_prompt="{lang:search}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+      <!-- END quick_search -->
       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
       <!-- END summary -->
       <!-- BEGIN upload -->