Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/oacs-view.adp	23 Jun 2006 09:25:18 -0000	1.4
+++ openacs-4/packages/xowiki/www/oacs-view.adp	26 Jul 2006 22:56:46 -0000	1.5
@@ -4,105 +4,7 @@
   <property name="header_stuff">@header_stuff;noquote@
 <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all'>
 <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-<style type='text/css'>
-#at-a-glance :active  {background: #999999;}
-#at-a-glance td.inactive  {color: #999999;}
-#at-a-glance td.active  {color: #003b53;}
-#at-a-glance td.today  {color: #FFFFFF;}
-
-#wikicmds {position: relative; top: -24px;  right: 0px; height: 0px;
-	  text-align: right;  font-family: sans-serif; font-size: 85%;color: #7A7A78;}
-#portal #wikicmds {top: -90px}
-#wikicmds a, #wikicmds a:visited { color: #7A7A78; text-decoration: none;}
-#wikicmds a:hover {text-decoration: underline;}
-#wikicmds a:active {color: rgb(255,153,51);}
-#cmdbar {
-	background: transparent repeat-x url(/resources/xowiki/aqua.png);
-	border-bottom: solid 1px rgb(221,221,221);
-	font-family: sans-serif;  font-size: 85%;
-	padding: 0.25em 0.5em 0.25em 0 .5em;
-	color: #7A7A78;
-	margin-bottom: 2px;
-}
-a.external {
-	color: #002bb8;
-	background: url(/resources/xowiki/external.png) right center no-repeat;
-	padding-right: 12px;
-}
-h1 {
-	border-bottom: solid silver 1px; color: #222222; 
-	margin-top: 0.5em;	margin-bottom: 0.5em;
-	text-align: left; font-weight: normal;
-}
-
-h2 {
-	border-bottom: 1px solid silver; color: #222222;
-	margin-top: 1em; margin-bottom: 0.25em;
-	text-align: left; font-weight: normal;
-}
-
-h3 {
-	text-indent: 0em; margin-top: 0.75em; margin-bottom: 0.0em;
-	letter-spacing: 0px;  color: #222222;
-	text-align: left; font-weight: bold;
-}
-
-hr {
-   height: 1px; border: none; 
-   color: silver; background-color: silver;
-} 
-#page-body {background: #fff; font: 10pt Arial, Helvetica, sans-serif;}
-table, td       {font: 10px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; color: #000;}
-#main div.column {text-align: left; margin-bottom: 1em;}
-#content      {float: left; width: 68%}
-#page-body h1 {font-size: 24px; margin: 0 0 .5em 0;}
-#page-body h2 {font-size: 16px}
-#page-body h3 {font-size: 12px}
-#page-body h4 {font-size: 10px; margin: 0;}
-#page-body .box {border: 1px solid #a1a5a9; padding: 0 5px 5px 5px; margin: 0 0 1.25em 0;}
-#content .box h2 {border-bottom: 1px solid #a1a5a9; padding: 5px; background: #f2f2f2; margin: 0 -5px 5px -5px; font-size: 12px;}
-#sidebar {float: right; width: 29%; font: 10px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;}
-#sidebar h2 {font-size: 12px; margin: 0;}
-#sidebar h3 {font-size: 11px; margin: 0;}
-#sidebar h4 {font-size: 10px; margin: 0;}
-#sidebar .sidebox li {font-size: 10px; margin: 0;}
-img.found {border: 0; height: 12px}
-img.undefined {border: 10; color: yellow; height: 12px}
-
-#left-col   {float: left;    width: 40%; top: 0px;}
-#right-col {float: right; width: 59%;  top: 0px;}
-
-#left-col20 {float: left; width: 14%; top: 0px; margin-right: 10px;}
-#left-col25 {float: left; width: 24%; top: 0px; margin-right: 10px;}
-#left-col30 {float: left; width: 29%; top: 0px; margin-right: 10px;}
-#left-col70 {float: left; width: 69%; top: 0px;}
-#left-col75 {float: left; width: 74%; top: 0px;}
-#left-col80 {float: left; width: 79%; top: 0px;}
-
-#right-col20 {float: right; width: 14%; top: 0px; margin-right: 10px;}
-#right-col25 {float: right; width: 24%; top: 0px; margin-right: 10px;}
-#right-col30 {float: right; width: 29%; top: 0px; margin-right: 10px;}
-#right-col70 {float: right; width: 69%; top: 0px;}
-#right-col75 {float: right; width: 74%; top: 0px;}
-#right-col80 {float: right; width: 79%; top: 0px;}
-
-#messages .timestamp {font-size: 80%; color: grey}
-#messages .user {font-size: 80%; font-weight: bold; color: grey}
-#messages .message {vertical-align: top}
-
-.rss {border:1px solid;
-	border-color:#FC9 #630 #330 #F96;
-	padding: 2px;
-	font: 9px verdana,sans-serif;
-	color: #FFF;
-	background: #F60;
-	text-decoration:none;
-	margin:0;
-	margin-right:10px;}
-a:hover.rss {color:#dddddd;}
-a:visited.rss {color: #FFF}
-a:link.rss {color: #FFF}
-</style>
+<link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
 <script type="text/javascript">
 function get_popular_tags() {
   var http = getHttpObject();
@@ -127,17 +29,12 @@
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 
 <div id='wikicmds'>
-  <if @write_p@ eq 1>
-    <a href='@edit_link@' accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot;
-    <a href="@rev_link@" accesskey='r' >#xotcl-core.revisions#</a> &middot;
-<!--  <a href="changes?object_type=CrWikiPage&item_id=@item_id@" accesskey='c'> chg</a> &middot; -->
-   <a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot;
-  </if>
-  <if @admin_p@ eq 1>
-   <a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot;
-   <a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot;
-  </if>
-   <a href="@index_link@" accesskey='i'>#xowiki.index#</a> 
+  <if @edit_link@ not nil><a href='@edit_link@' accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
+  <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' >#xotcl-core.revisions#</a> &middot;</if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot;</if>
+  <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot;</if>
+  <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot;</if>
+  <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
 </div>
 
 <div style="float:left; 
@@ -153,21 +50,21 @@
 @content;noquote@
 </div>
 <div style="clear: both; text-align: left; font-size: 85%;">
+<if @references@ ne "">
+<if @lang_links@ ne "">
 <p/>&nbsp;<hr>#xowiki.references_label# @references;noquote@
 @lang_links;noquote@
+</if></if>
 <br>
 <if @no_tags@ eq 0>
 #xowiki.your_tags_label#: @tags_with_links;noquote@
 (<a href='#' onclick='document.getElementById("edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
 <a href='#' onclick='get_popular_tags();return false;'>#xowiki.popular_tags_link#</a>)
-<span id='edit_tags' style='display: none'><FORM action='@save_tag_link@'>
-<INPUT name='tags' type='text' value='@tags@'>
-<INPUT name='item_id' type='hidden' value='@item_id@'>
-<INPUT name='query' type='hidden' value='@return_url@'>
-</FORM>
+<span id='edit_tags' style='display: none'>
+<FORM action='@save_tag_link@' method='POST'><INPUT name='tags' type='text' value='@tags@'></FORM>
 </span>
-</if>
 <span id='popular_tags' style='display: none'></span>
+</if>
 </div><br>
 <if @gc_comments@ not nil>
    <p>#general-comments.Comments#