Merge https://github.com/redmatrix/hubzilla into pending_merge

10 files changed, 29 insertions, 21 deletions

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 47f01ef5d..35e97f3e9 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -4,6 +4,7 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
+	<div class="contact-entry-name-end" ></div>
 	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div>
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 9472bd961..da38f3571 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 	<div id="login-main">
@@ -16,4 +17,5 @@
 		<input type="hidden" name="{{$k}}" value="{{$v}}" />
 	{{/foreach}}
 </form>
+</div>
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index f6fdb28d7..8ecfd215b 100755
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
@@ -8,11 +9,9 @@
 <div id="login-name-wrapper">
         <label for="login-name" id="label-login-name">{{$name}}</label>
         <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
 <div id="login-submit-end"></div>
 </form>
-
+</div>
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index ccb995849..32d544a86 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,7 +1,8 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 {{foreach $apps as $ap}}
 {{$ap}}
 {{/foreach}}
 <div class="clear"></div>
-
+</div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0ce9c36a8..d22f82f8e 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -18,11 +18,13 @@
 	</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 class="section-content-wrapper-np">
+		<div id="photo-album-contents">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
 	</div>
 </div>
 <div class="photos-end"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 15faa4a34..46ac65e87 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -7,11 +7,13 @@
 		<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 class="section-content-wrapper-np">
+		<div id="photo-album-contents">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
 	</div>
 </div>
 <div class="photos-end"></div>
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
index 7bef7a417..debba13a8 100644
--- a/view/tpl/prep.tpl
+++ b/view/tpl/prep.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 
 {{if $site}}
@@ -27,8 +28,4 @@
 </div>
 {{/foreach}}
 {{/if}}
-
-
-
-
-
+</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index 95c2eb03f..d072a0b3c 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -19,4 +19,4 @@
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
-</form>
\ No newline at end of file
+</form>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index ed673031a..005b122cf 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
 <form action="register" method="post" id="register-form">
@@ -49,3 +50,4 @@
 	<div id="register-submit-end" class="register-field-end"></div>
 
 </form>
+</div>
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index 58df71718..d0f7aab64 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <form action="rmagic" method="post" >
@@ -9,3 +10,4 @@
 	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
 
 </form>
+</div>