Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	util/messages.po

20 files changed, 345 insertions, 308 deletions

diff --git a/view/.htaccess b/view/.htaccess
index 559a5fcc0..7aa6c4506 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,3 +1,9 @@
 <FilesMatch "\.tpl">
-Deny from all
-</FilesMatch>
\ No newline at end of file
+  <IfModule mod_authz_core.c>
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+  </IfModule>
+</FilesMatch>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 946e2d7d7..ad203867c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1889,7 +1889,6 @@ nav .dropdown-menu {
 	color: #31708f;
 	background-color: #d9edf7;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
@@ -1898,7 +1897,6 @@ nav .dropdown-menu {
 	color: #8a6d3b;
 	background-color: #fcf8e3;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
@@ -1907,10 +1905,20 @@ nav .dropdown-menu {
 	color: #a94442;
 	background-color: #f2dede;
 	margin-bottom: 3px;
-	border-radius: $radiuspx;
 	text-align: center;
 }
 
+.section-content-tools-wrapper .section-content-info-wrapper,
+.section-content-wrapper .section-content-info-wrapper,
+.section-content-tools-wrapper .section-content-warning-wrapper,
+.section-content-wrapper .section-content-warning-wrapper,
+.section-content-tools-wrapper .section-content-danger-wrapper,
+.section-content-wrapper .section-content-danger-wrapper {
+	margin-bottom: 0px;
+	border-radius: $radiuspx;
+}
+
+
 .section-content-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 2603fb267..fe3ea9742 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -84,8 +84,10 @@ function redbasic_form(&$a, $arr) {
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file, ".php");
-			$scheme_name = $f;
-			$scheme_choices[$f] = $scheme_name;
+			if($f != 'default') {
+				$scheme_name = $f;
+				$scheme_choices[$f] = $scheme_name;
+			}
 		}
 	}
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 956c1951c..6e68d38d5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -70,6 +70,7 @@ if (($schema) && ($schema != '---')) {
 
 // If we haven't got a schema, load the default.  We shouldn't touch this - we
 // should leave it for admins to define for themselves.
+// default.php and default.css MUST be symlinks to existing schema files.
 if (! $schema) {
 
 	if(file_exists('view/theme/redbasic/schema/default.php')) {
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index 85e4865ea..27dbcbf0c 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -1,67 +1,69 @@
-<div class="section-title-wrapper">
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
 	{{if $editor}}
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+	<div id="block-editor" class="section-content-tools-wrapper">
+		{{$editor}}
 	</div>
 	{{/if}}
-	<h2>{{$title}}</h2>
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="block-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$blocktitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="hidden-xs">{{$created}}</th>
+				<th width="1%" class="hidden-xs">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="block-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
+					{{else}}
+					{{$item.name}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.created}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
 	<div class="clear"></div>
+	{{/if}}
 </div>
-{{if $editor}}
-<div id="block-editor" class="section-content-tools-wrapper">
-	{{$editor}}
-</div>
-{{/if}}
-{{if $pages}}
-<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-	<table id="block-list-table">
-		<tr>
-			<th width="1%">{{$name}}</th>
-			<th width="94%">{{$blocktitle}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%" class="hidden-xs">{{$created}}</th>
-			<th width="1%" class="hidden-xs">{{$edited}}</th>
-		</tr>
-		{{foreach $pages as $key => $items}} 
-		{{foreach $items as $item}}
-		<tr id="block-list-item-{{$item.url}}">
-			<td>
-				{{if $view}}
-				<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
-				{{else}}
-				{{$item.name}}
-				{{/if}}
-			</td>
-			<td>
-				{{$item.title}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $item.bb_element}}
-				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
-				{{/if}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.created}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.edited}}
-			</td>
-		</tr>
-		{{/foreach}}
-		{{/foreach}}
-	</table>
-</div>
-<div class="clear"></div>
-{{/if}}
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index f76594934..6974e4d30 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -36,5 +36,8 @@
 	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
 	<div id="import-submit-end" class="import-field-end"></div>
 
+	<div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div>
+
+
 </form>
 
diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl
new file mode 100644
index 000000000..d1567af9f
--- /dev/null
+++ b/view/tpl/cloud.tpl
@@ -0,0 +1,4 @@
+<div class="generic-content-wrapper">
+{{include file="cloud_header.tpl"}}
+{{include file="cloud_directory.tpl"}}
+</div>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index c1d03da83..0c7892c25 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper section-content-wrapper-np">
+<div class="section-content-wrapper-np">
 	<table id="cloud-index">
 		<tr>
 			<th width="1%"></th>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index e0acc25ae..27632d770 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 85425b4e2..cb2fb8959 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}} conv-list-mode">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper conv-list-mode{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 97d64327a..82c7be922 100755
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -1,6 +1,6 @@
 <div id="threads-begin"></div>
 {{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
 	{{foreach $thread.items as $item}}
 		{{if $item.comment_firstcollapsed}}
 			<div class="hide-comments-outer">
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index ab7408eae..cf172e197 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -1,69 +1,71 @@
-<div class="section-title-wrapper">
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+			<a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i>&nbsp;{{$help.text}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
 	{{if $editor}}
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
-		<a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i>&nbsp;{{$help.text}}</a>
+	<div id="layout-editor" class="section-content-tools-wrapper">
+		{{$editor}}
 	</div>
 	{{/if}}
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-{{if $editor}}
-<div id="layout-editor" class="section-content-tools-wrapper">
-	{{$editor}}
-</div>
-{{/if}}
 
-{{if $pages}}
-<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-	<table id="layout-list-table">
-		<tr>
-			<th width="1%">{{$name}}</th>
-			<th width="94%">{{$descr}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%" class="hidden-xs">{{$created}}</th>
-			<th width="1%" class="hidden-xs">{{$edited}}</th>
-		</tr>
-		{{foreach $pages as $key => $items}} 
-		{{foreach $items as $item}}
-		<tr id="layout-list-item-{{$item.url}}">
-			<td>
-				{{if $view}}
-				<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
-				{{else}}
-				{{$item.title}}
-				{{/if}}
-			</td>
-			<td>
-				{{$item.descr}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $item.bb_element}}
-				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
-				{{/if}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.created}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.edited}}
-			</td>
-		</tr>
-		{{/foreach}}
-		{{/foreach}}
-	</table>
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="layout-list-table">
+			<tr>
+				<th width="1%">{{$name}}</th>
+				<th width="94%">{{$descr}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="hidden-xs">{{$created}}</th>
+				<th width="1%" class="hidden-xs">{{$edited}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="layout-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+					{{else}}
+					{{$item.title}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.descr}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.created}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
+	</div>
+	<div class="clear"></div>
+	{{/if}}
 </div>
-<div class="clear"></div>
-{{/if}}
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 888dc6e6d..743165cc3 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -1,38 +1,40 @@
-<div class="section-title-wrapper">
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
 	</div>
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
 
-{{$create}}
+	{{$create}}
 
-{{if $menus }}
-<div id="menulist-content-wrapper" class="section-content-wrapper-np">
-	<table id="menu-list-table">
-		<tr>
-			<th width="1%"></th>
-			<th width="1%">{{$nametitle}}</th>
-			<th width="93%">{{$desctitle}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%" class="hidden-xs">{{$created}}</th>
-			<th width="1%" class="hidden-xs">{{$edited}}</th>
-		</tr>
-		{{foreach $menus as $m }}
-		<tr id="menu-list-item-{{$m.menu_id}}">
-			<td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
-			<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
-			<td>{{$m.menu_desc}}</td>
-			<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
-			<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td>
-			<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
-			<td class="hidden-xs">{{$m.menu_created}}</td>
-			<td class="hidden-xs">{{$m.menu_edited}}</td>
-		</tr>
-		{{/foreach}}
-	</table>
+	{{if $menus }}
+	<div id="menulist-content-wrapper" class="section-content-wrapper-np">
+		<table id="menu-list-table">
+			<tr>
+				<th width="1%"></th>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="93%">{{$desctitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="hidden-xs">{{$created}}</th>
+				<th width="1%" class="hidden-xs">{{$edited}}</th>
+			</tr>
+			{{foreach $menus as $m }}
+			<tr id="menu-list-item-{{$m.menu_id}}">
+				<td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+				<td>{{$m.menu_desc}}</td>
+				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td>
+				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+				<td class="hidden-xs">{{$m.menu_created}}</td>
+				<td class="hidden-xs">{{$m.menu_edited}}</td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
 </div>
-{{/if}}
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 5506b01f2..0ce9c36a8 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,27 +1,29 @@
-<div class="section-title-wrapper">
-	<div class="pull-right">
-		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		<div class="btn-group btn-group">
-			{{if $album_edit.1}}
-			<i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-			{{/if}}
-			{{if $can_post}}
-			<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
-			{{/if}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+			<div class="btn-group btn-group">
+				{{if $album_edit.1}}
+				<i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+				{{/if}}
+				{{if $can_post}}
+				<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+				{{/if}}
+			</div>
 		</div>
-	</div>
 
-	<h2>{{$album}}</h2>
+		<h2>{{$album}}</h2>
 
-	<div class="clear"></div>
-</div>
-{{$upload_form}}
-{{$album_edit.1}}
-<div id="photo-album-contents" class="generic-content-wrapper">
-	{{foreach $photos as $photo}}
-		{{include file="photo_top.tpl"}}
-	{{/foreach}}
-	<div id="page-end"></div>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	{{$album_edit.1}}
+	<div id="photo-album-contents">
+		{{foreach $photos as $photo}}
+			{{include file="photo_top.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
 </div>
 <div class="photos-end"></div>
 <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 1054d5e3a..63d5ad778 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,6 +1,5 @@
 <div id="live-photos"></div>
 <div class="generic-content-wrapper">
-
 	<div class="section-title-wrapper">
 		<div class="pull-right">
 
@@ -155,17 +154,17 @@
 		{{/if}}
 		<div class="clear"></div>
 	</div>
-</div>
 
-{{$comments}}
+	{{$comments}}
 
-{{if $commentbox}}
-<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
-	{{$commentbox}}
-</div>
-{{/if}}
+	{{if $commentbox}}
+	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+		{{$commentbox}}
+	</div>
+	{{/if}}
 
-<div class="clear"></div>
+	<div class="clear"></div>
+</div>
 
 {{$paginate}}
 
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 7727abcea..15faa4a34 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,16 +1,18 @@
-<div class="section-title-wrapper">
-	{{if $can_post}}
-	<button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
-	{{/if}}
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-{{$upload_form}}
-<div id="photo-album-contents" class="generic-content-wrapper">
-	{{foreach $photos as $photo}}
-		{{include file="photo_top.tpl"}}
-	{{/foreach}}
-	<div id="page-end"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $can_post}}
+		<button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	<div id="photo-album-contents">
+		{{foreach $photos as $photo}}
+			{{include file="photo_top.tpl"}}
+		{{/foreach}}
+		<div id="page-end"></div>
+	</div>
 </div>
 <div class="photos-end"></div>
 <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 009ee0f9f..bf02c614d 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,4 +1,4 @@
-<div id="photo-upload-form" class="generic-content-wrapper">
+<div id="photo-upload-form">
 	<div class="section-content-tools-wrapper">
 		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index d5a608c82..dee33f1b3 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -1,4 +1,4 @@
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
 	<a name="{{$item.id}}" ></a>
 	<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
index cb365ed05..4ffacc241 100644
--- a/view/tpl/sharedwithme.tpl
+++ b/view/tpl/sharedwithme.tpl
@@ -1,24 +1,26 @@
-<div class="section-title-wrapper">
-	<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
-	<h2>{{$header}}</h2>
-</div>
-<div class="generic-content-wrapper section-content-wrapper-np">
-	<table id="cloud-index">
-		<tr>
-			<th width="1%"></th>
-			<th width="92%">{{$name}}</th>
-			<th width="1%"></th>
-			<th width="1%" class="hidden-xs">{{$size}}</th>
-			<th width="1%" class="hidden-xs">{{$lastmod}}</th>
-		</tr>
-	{{foreach $items as $item}}
-		<tr id="cloud-index-{{$item.id}}">
-			<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
-			<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
-			<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
-			<td class="hidden-xs">{{$item.objfilesize}}</td>
-			<td class="hidden-xs">{{$item.objedited}}</td>
-		</tr>
-	{{/foreach}}
-	</table>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper-np">
+		<table id="cloud-index">
+			<tr>
+				<th width="1%"></th>
+				<th width="92%">{{$name}}</th>
+				<th width="1%"></th>
+				<th width="1%" class="hidden-xs">{{$size}}</th>
+				<th width="1%" class="hidden-xs">{{$lastmod}}</th>
+			</tr>
+		{{foreach $items as $item}}
+			<tr id="cloud-index-{{$item.id}}">
+				<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
+				<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
+				<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+				<td class="hidden-xs">{{$item.objfilesize}}</td>
+				<td class="hidden-xs">{{$item.objedited}}</td>
+			</tr>
+		{{/foreach}}
+		</table>
+	</div>
 </div>
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 77fb09492..864705121 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -1,74 +1,76 @@
-<div class="section-title-wrapper">
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $editor}}
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+		</div>
+		{{/if}}
+		<h2>{{$listtitle}}</h2>
+		<div class="clear"></div>
+	</div>
 	{{if $editor}}
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
+	</div>
+	{{/if}}
+	{{if $pages}}
+	<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+		<table id="webpage-list-table">
+			<tr>
+				<th width="1%">{{$pagelink_txt}}</th>
+				<th width="95%">{{$title_txt}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%" class="hidden-xs">{{$created_txt}}</th>
+				<th width="1%" class="hidden-xs">{{$edited_txt}}</th>
+			</tr>
+			{{foreach $pages as $key => $items}}
+			{{foreach $items as $item}}
+			<tr id="webpage-list-item-{{$item.url}}">
+				<td>
+					{{if $view}}
+					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					{{else}}
+					{{$item.pagetitle}}
+					{{/if}}
+				</td>
+				<td>
+					{{$item.title}}
+				</td>
+				<td class="webpage-list-tool dropdown">
+					{{if $item.lockstate=='lock'}}
+					<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+					<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $item.bb_element}}
+					<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+					{{/if}}
+				</td>
+				<td class="webpage-list-tool">
+					{{if $edit}}
+					<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+					{{/if}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.created}}
+				</td>
+				<td class="hidden-xs">
+					{{$item.edited}}
+				</td>
+			</tr>
+			{{/foreach}}
+			{{/foreach}}
+		</table>
 	</div>
 	{{/if}}
-	<h2>{{$listtitle}}</h2>
 	<div class="clear"></div>
 </div>
-{{if $editor}}
-<div id="webpage-editor" class="section-content-tools-wrapper">
-	{{$editor}}
-</div>
-{{/if}}
-{{if $pages}}
-<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
-	<table id="webpage-list-table">
-		<tr>
-			<th width="1%">{{$pagelink_txt}}</th>
-			<th width="95%">{{$title_txt}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%" class="hidden-xs">{{$created_txt}}</th>
-			<th width="1%" class="hidden-xs">{{$edited_txt}}</th>
-		</tr>
-		{{foreach $pages as $key => $items}} 
-		{{foreach $items as $item}}
-		<tr id="webpage-list-item-{{$item.url}}">
-			<td>
-				{{if $view}}
-				<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
-				{{else}}
-				{{$item.pagetitle}}
-				{{/if}}
-			</td>
-			<td>
-				{{$item.title}}
-			</td>
-			<td class="webpage-list-tool dropdown">
-				{{if $item.lockstate=='lock'}}
-				<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
-				<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $item.bb_element}}
-				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
-				{{/if}}
-			</td>
-			<td class="webpage-list-tool">
-				{{if $edit}}
-				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
-				{{/if}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.created}}
-			</td>
-			<td class="hidden-xs">
-				{{$item.edited}}
-			</td>
-		</tr>
-		{{/foreach}}
-		{{/foreach}}
-	</table>
-</div>
-<div class="clear"></div>
-{{/if}}