Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -14,7 +14,8 @@
 
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -15,7 +15,8 @@
 
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	10 Sep 2016 11:29:13 -0000	1.1.2.1
@@ -0,0 +1,104 @@
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
+<master>
+                  <property name="context">@context;literal@</property>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
+                  <property name="head">
+        <style type='text/css'>
+            blockquote {font-size:inherit;}
+            div.xowiki-content {font-size:14px;}
+            div.xowiki-content h1,h2,h3 {margin-bottom:10px;margin-top:20px;}
+            div.xowiki-content h1 {border-bottom: none;color:font-weight:500;color:#cf8a00 !important;}
+            div.xowiki-content h2 {border-bottom: none;color:font-weight:500;}
+            div.xowiki-content h3 {font-weight:500;}
+            div.xowiki-content pre, div.code {font-size:100%;}
+            div.xowiki-content .item-footer {border-top:none;}
+        </style>
+        <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+        <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
+        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+      @header_stuff;literal@</property>
+<!-- The following DIV is needed for overlib to function! -->
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div class='xowiki-content'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
+      <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
+      <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
+      <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
+      <if @new_link@ not nil><a href="@new_link@" accesskey='n' title='#xowiki.new_title#'>#xowiki.new_page#</a> &middot; </if>
+      <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
+      <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
+      <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
+      <div id='do_search' style='display: none'>
+      <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
+      </div>
+      </div>
+ 
+    <div class="row"> 
+
+        <div class="col-md-9 col-sm-8 col-xs-12 col-md-push-3 col-sm-push-4"> <!-- content -->
+            @top_includelets;noquote@
+            <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+            <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+            <else><h1>@body.title@</h1></else>
+            <if @folderhtml@ not nil> 
+                <div class='folders' style=''>@folderhtml;noquote@</div> 
+                <div class='content-with-folders'>@content;noquote@</div> 
+            </if>
+            <else>@content;noquote@</else>
+        </div> <!-- content -->
+
+        <div class="col-md-3 col-sm-4 col-xs-12 home-left col-md-pull-9 col-sm-pull-8" style="font-size:small;"> <!-- left panel in full view -->
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" &__including_page=page summary="0" noparens="0">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -decoration plain">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -popular 1 -limit 30 -decoration plain">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="presence -interval {30 minutes} -decoration plain">
+                    <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
+                </div>
+            </div> <!-- background -->
+
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="categories -open_page [list @name@] -decoration plain">
+                </div>
+            </div>  <!-- background -->
+        </div>
+    </div>
+   <div class="row">
+        <div class="col-xs-12">
+            <hr>        
+            @footer;noquote@
+        </div>
+    </div>
+        
+
+</div> <!-- class='xowiki-content' -->
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -20,7 +20,8 @@
 
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -11,7 +11,8 @@
 
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,11 +1,12 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
 
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	10 Sep 2016 11:29:13 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 13:25:13 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.45.2.3 -r1.45.2.4
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	10 Sep 2016 10:11:41 -0000	1.45.2.3
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	10 Sep 2016 11:29:13 -0000	1.45.2.4
@@ -36,7 +36,8 @@
     return {
       <%
          template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
+             event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
              return false;
@@ -275,7 +276,89 @@
 
         }]
       }
+  
+  # oacs-view3-bootstrap3
+  #
+  # similar to oacs view3, but based on bootstrap
+  #
+  ADP_Generator create oacs-view3-bootstrap3 -master 1 -footer 0 -wikicmds 1 \
+      -extra_header_stuff {
+        <style type='text/css'>
+            blockquote {font-size:inherit;}
+            div.xowiki-content {font-size:14px;}
+            div.xowiki-content h1,h2,h3 {margin-bottom:10px;margin-top:20px;}
+            div.xowiki-content h1 {border-bottom: none;color:font-weight:500;color:#cf8a00 !important;}
+            div.xowiki-content h2 {border-bottom: none;color:font-weight:500;}
+            div.xowiki-content h3 {font-weight:500;}
+            div.xowiki-content pre, div.code {font-size:100%;}
+            div.xowiki-content .item-footer {border-top:none;}
+        </style>
+        <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+        <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
+        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+      } \
+      -proc before_render {page} {
+        ::xo::cc set_parameter weblog_page weblog-portlet
+      } \
+      -proc content_part {} {
+        set open_page {-open_page [list @name@]}
+        return [subst -novariables -nobackslashes {\
 
+    <div class="row"> 
+
+        <div class="col-md-9 col-sm-8 col-xs-12 col-md-push-3 col-sm-push-4"> <!-- content -->
+            @top_includelets;noquote@
+            <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+            <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+            <else><h1>@body.title@</h1></else>
+            <if @folderhtml@ not nil> 
+                <div class='folders' style=''>@folderhtml;noquote@</div> 
+                <div class='content-with-folders'>@content;noquote@</div> 
+            </if>
+            <else>@content;noquote@</else>
+        </div> <!-- content -->
+
+        <div class="col-md-3 col-sm-4 col-xs-12 home-left col-md-pull-9 col-sm-pull-8" style="font-size:small;"> <!-- left panel in full view -->
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" &__including_page=page summary="0" noparens="0">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -decoration plain">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -popular 1 -limit 30 -decoration plain">
+                </div>
+            </div>
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="presence -interval {30 minutes} -decoration plain">
+                    <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
+                </div>
+            </div> <!-- background -->
+
+            <div class="thumbnail">
+                <div class="caption">
+                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="categories [set open_page] -decoration plain">
+                </div>
+            </div>  <!-- background -->
+        </div>
+    </div>
+   <div class="row">
+        <div class="col-xs-12">
+            <hr>        
+            @footer;noquote@
+        </div>
+    </div>
+        }]
+      }
+
+
+  
   ####################################################################################
   #
   # view-book
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.200.2.13 -r1.200.2.14
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	10 Sep 2016 10:11:41 -0000	1.200.2.13
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	10 Sep 2016 11:29:13 -0000	1.200.2.14
@@ -1421,20 +1421,22 @@
     }
     set content [subst {
       #xowiki.your_tags_label#: $tags_with_links
-      (<a id='[my id]-edit-tags-control' href='#'>#xowiki.edit_link#</a>,
-       <a id='[my id]-popular-tags-control' href='#'>#xowiki.popular_tags_link#</a>)
+      (<a id='[my id]-edit-tags-control' href='.'>#xowiki.edit_link#</a>,
+       <a id='[my id]-popular-tags-control' href='.'>#xowiki.popular_tags_link#</a>)
       <form id='[my id]-edit_tags' style='display: none' action="[ns_quotehtml $save_tag_link]" method='POST'>
       <div><input name='new_tags' type='text' value="[ns_quotehtml $tags]"></div>
       </form>
       <span id='[my id]-popular_tags' style='display: none'></span><br >
     }]
 
     template::add_body_script -script [subst {
-      document.getElementById('[my id]-edit-tags-control').addEventListener('click', function () {
+      document.getElementById('[my id]-edit-tags-control').addEventListener('click', function (event) {
+        event.preventDefault();
         document.getElementById("[my id]-edit_tags").style.display="block";
         return false;
       });
-      document.getElementById('[my id]-popular-tags-control').addEventListener('click', function () {
+      document.getElementById('[my id]-popular-tags-control').addEventListener('click', function (event) {
+        event.preventDefault();
         get_popular_tags("[ns_quotehtml $popular_tags_link]","[my id]");
         return false;
       });