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

view/theme/redbasic/css/style.css

@@ -1228,6 +1228,9 @@ footer {
 	border: none;
 }
 
+div.dirtagblock.widget {
+  overflow: hidden;
+}
 
 .pager {
   padding: 10px;
@@ -2496,7 +2499,7 @@ brain is weird like that */
 }
 
 .field_abook_help {
-	color: #888;
+	color: #000;
 }
 .abook-them {
 	margin-left: 225px;
@@ -2510,6 +2513,13 @@ brain is weird like that */
 	margin-bottom: 5px !important;
 }
 
+.abook-pending-contact {
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+}
+
 #contact-slider {
 	width: 600px !important;
 }
@@ -3350,6 +3360,21 @@ div.page-list-item {
 margin: 20px;
 }
 
+div#write-pages {
+display: block;
+position: fixed;
+top: 24px;
+z-index: 99;
+background: silver;
+width: 100%;
+left: 0;  
+}
+
+div#write-pages a {
+color: #000;
+margin-right: 50px;
+}
+
 .pmenu ul {
 	list-style-type: none;
 }

view/tpl/abook_edit.tpl

@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper">
 <h2>{{$header}}</h2>
 
 <h3>{{$addr}}</h3>
@@ -40,7 +41,9 @@
 
 
 {{if $is_pending}}
+<div class="abook-pending-contact">
 {{include file="field_checkbox.tpl" field=$unapproved}}
+</div>
 {{/if}}
 
 <br />
@@ -82,3 +85,4 @@
 
 </form>
 </div>
+</div>

view/tpl/write_pages.tpl

@@ -1,3 +1,3 @@
 <div id="write-pages" class="bigwidget">
-<center><span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span></center>
+<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span>
 </div>