Change position of Create View, etc. buttons for automatically generated page headings

htdocs/artefact/blog/theme/default/list.tpl

@@ -11,11 +11,9 @@
 
 {include file="columnleftstart.tpl"}
 		<div id="myblogs">
-            <div class="addiconcontainer">
-              <span class="addicon">
+              <span class="addicon fr">
                 <a href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
               </span>
-            </div>
 			<table id="bloglist" class="hidden tablerenderer">
 				<thead>
 					<tr>

htdocs/artefact/blog/theme/default/view.tpl

@@ -13,14 +13,10 @@
 
                 {$blog->get('description')}
 
-                <div class="blogsettingscontainer">
-                    <span class="addicon">
+                    <span class="addicon fr">
                         <a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
-                    </span>
-                    <span class="settingsicon">  
                         <a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
                     </span>
-                </div>
 		
                 {if $blog->count_children() > 0}
 				<div><table id="postlist" class="hidden tablerenderer">

htdocs/interaction/forum/lang/en.utf8/interaction.forum.php

@@ -107,6 +107,7 @@ $string['subscribetoforum'] = 'Subscribe to forum';
 $string['subscribetotopic'] = 'Subscribe to topic';
 $string['Subject'] = 'Subject';
 $string['Topic'] = 'Topic';
+$string['Topics'] = 'Topics';
 $string['topiclower'] = 'topic';
 $string['topicslower'] = 'topics';
 $string['topicclosedsuccess'] = 'Topics closed successfully';

htdocs/interaction/forum/theme/default/index.tpl

@@ -2,14 +2,12 @@
 {include file="sidebar.tpl"}
 
 {include file="columnleftstart.tpl"}
-
+<h2>{str tag="nameplural" section=interaction.forum}</h2>
 <div>
 {if $admin}
-<div class="fr">
-<span class="addicon">
+<span class="addicon fr">
 <a href="{$WWWROOT}interaction/edit.php?group={$groupid|escape}&amp;plugin=forum">{str tag="newforum" section=interaction.forum}</a>
 </span>
-</div>
 {/if}
 <br>
 {str tag="groupadminlist" section="interaction.forum"}

htdocs/interaction/forum/theme/default/view.tpl

@@ -15,6 +15,8 @@
 	<td align="right" class="subscribetoforum">{$forum->subscribe}</td>
 </tr>
 </table>
+
+<h3>{str tag=Topics section="interaction.forum"}</h3>
 <span class="addicon fr">
 <a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id|escape}">{str tag="newtopic" section="interaction.forum}</a>
 </span>

htdocs/theme/default/static/style/style.css

@@ -199,6 +199,7 @@ a:hover {
 	font-size: 11px;
 	color: #FFF;
 }
+span.addicon { display: block; margin-top: -16px; float: right; }
 .addicon form,
 .addicon form div {
   display: inline;
@@ -206,7 +207,7 @@ a:hover {
 .addicon input.submit {
   height: 20px;
 }
-span.addicon a {
+.addicon a {
 	background-color: #92b328;
 	padding: 2px 10px;
 	border-color: #D9DFEA #b2b2b2 #b2b2b2 #D9DFEA !important;
@@ -216,7 +217,7 @@ span.addicon a {
 	color: #FFF !important;
 }
 #btn-logout:hover,
-span.addicon a:hover {
+.addicon a:hover {
 	text-decoration: none;
 	color: #FFF;
 }
@@ -1690,10 +1691,6 @@ button#dosearch {
 #bloglist {
 	border-bottom: 1px solid #95a8b7;
 }
-#myblogs .addiconcontainer {
-    margin: 0;
-	float: right;
-}
 #myblogs .blogsettingscontainer {
 	margin-top: 10px;
 }

htdocs/theme/default/templates/view/index.tpl

@@ -2,24 +2,25 @@
 {include file="sidebar.tpl"}
 {include file="columnleftstart.tpl"}
 
+<div>
 <span class="addicon fr">
-{$createviewform}
-<form method="post" action="{$WWWROOT}view/choosetemplate.php">
-<input type="submit" class="submit" value="{str tag="copyaview" section="view"}">
+  {$createviewform}
+  <form method="post" action="{$WWWROOT}view/choosetemplate.php">
+    <input type="submit" class="submit" value="{str tag="copyaview" section="view"}">
 {if $GROUP}
-<input type="hidden" name="group" value="{$GROUP->id}" />
+    <input type="hidden" name="group" value="{$GROUP->id}" />
 {elseif $institution}
-<input type="hidden" name="institution" value="{$institution}">
+    <input type="hidden" name="institution" value="{$institution}">
 {/if}
-</form>
+  </form>
 </span>
 
 {if $institution}
   {$institutionselector}
 {/if}
 {if $views}
-<table id="myviewstable" class="groupviews">
-
+<table id="myviewstable">
+  <tbody>
 {foreach from=$views item=view}
     <tr class="{cycle values=r0,r1}">
     <td>
@@ -80,7 +81,7 @@
     </td>
     </tr>
 {/foreach}
-
+  </tbody>
 </table>
 
 <div class="center">{$pagination}</div>
@@ -93,6 +94,8 @@
 </table>
 {/if}
 
+</div>
+
 {include file="columnleftend.tpl"}
 {include file="footer.tpl"}