Merge https://github.com/friendica/red into zpull

8 files changed, 24 insertions, 14 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f4c399735..1105bb4bb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -331,6 +331,8 @@ ul.tabs {
 /* footer */
 
 footer {
+	position:fixed;
+	bottom:1px;
 	text-align: right;
 	padding-bottom: 1em;
 	padding-right: 3em; 
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index c6c0ab028..35bbbe0fd 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,13 +1,16 @@
 <div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
-		<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
-			<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
-		</div>
-	</div>
+<div class="generic-content-wrapper">
 
-	<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
-	{{if $entry.connect}}
-		<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
-	{{/if}}
-	<div class="contact-details">{{$entry.details}}</div>
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
+<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
+<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
+</div>
+</div>
+
+<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+{{if $entry.connect}}
+<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
+{{/if}}
+<div class="contact-details">{{$entry.details}}</div>
+</div>
 </div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index 26e02529a..7280f1e84 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper">
 {{foreach $mails as $mail}}
 	{{include file="mail_conv.tpl"}}
 {{/foreach}}
@@ -7,3 +8,4 @@
 {{else}}
 {{$unknown_text}}
 {{/if}}
+</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index fc4af8ddd..a01396ae5 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,4 +1,4 @@
-<div class="mail-list-wrapper">
+<div class="generic-content-wrapper" id="mail-list-wrapper">
 	<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
 	<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 7b4fdb96e..d8175bdd2 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,6 +1,6 @@
 <div class="page">
 
-<div class="page-content-wrapper" id="page-content-wrapper" >
+<div class="generic-content-wrapper" id="page-content-wrapper" >
 	<h3 class="page-title">{{$title}}</h3>
 	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
 	<div class="page-date">{{$date}}</div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index db48a8509..9f17a0ffa 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,3 +1,4 @@
+<div id="profile-content-wrapper" class="generic-content-wrapper">
 <h2>{{$title}}</h2>
 
 <dl id="aprofile-fullname" class="aprofile">
@@ -179,4 +180,4 @@
 {{/foreach}}
 {{/if}}
 
-
+</div>
diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl
index 414445039..20a65ffbe 100644
--- a/view/tpl/sellpage_view.tpl
+++ b/view/tpl/sellpage_view.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper">
 <h1>{{$header}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -7,3 +8,4 @@
 <div class="sellpage-final">{{$desc2}}</div>
 
 {{$submit}}
+</div>
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index b09dc9f38..9a189230b 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -2,7 +2,7 @@
 
 {{if $pages}}
 
-	   <div id="pagelist-content-wrapper">
+	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
 		{{foreach $pages as $key => $items}} 
 				{{foreach $items as $item}}
 					<div class="page-list-item">