Upstream merge

8 files changed, 29 insertions, 7 deletions

diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index e5412429f..3d2adc660 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -1,4 +1,4 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/logs" method="post">
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 01c178c3e..729ba5dc8 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -1,4 +1,4 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 		<ul id='pluginslist'>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 47c33bec3..f72142e41 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,4 +1,4 @@
-<div id='adminpage'>
+<div class = "generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 32c5db8fc..d0a5254fe 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -34,7 +34,7 @@
 		});
 	});
 </script>
-<div id='adminpage'>
+<div id="adminpage" class="generic-content-wrapper">
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/site" method="post">
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 88d87c35d..d3665626f 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -1,4 +1,4 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<dl>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 86389e9f2..770df7eba 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -10,7 +10,7 @@
 		return false;
 	}
 </script>
-<div id='adminpage'>
+<div class = "generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/users" method="post">
diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl
new file mode 100644
index 000000000..995b52cc8
--- /dev/null
+++ b/view/tpl/filestorage.tpl
@@ -0,0 +1,22 @@
+{{if $files}}
+
+	   <div class="generic-content-wrapper">
+		{{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}}
+
+
+		{{foreach $files as $key => $items}} 
+				{{foreach $items as $item}}
+					<div class="files-list-item">
+					<a href="attach/{{$item.download}}">{{$download}}</a> |
+					<a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}}
+					<a href="page/{{$channel}}/{{$item.title}}">{{$title}}</a> {{$item.title}} | 
+					{{$item.size}} bytes
+
+</div>
+				{{/foreach}}
+		{{/foreach}}
+	   </div>
+	
+	   <div class="clear"></div>
+
+{{/if}}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 72c0830cf..831cd9614 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,7 +1,7 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
 	<div id="peoplefind-desc">{{$desc}}</div>
-	<form action="dirfind" method="post" />
+	<form action="directory" method="post" />
 		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
 	</form>
 	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>