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

mod/search.php

@@ -35,6 +35,8 @@ function search_content(&$a,$update = 0, $load = false) {
 
 	$o = '<div id="live-search"></div>' . "\r\n";
 
+        $o = '<div class="generic-content-wrapper-styled">' . "\r\n";
+
 	$o .= '<h3>' . t('Search') . '</h3>';
 
 	if(x($a->data,'search'))
@@ -212,6 +214,8 @@ function search_content(&$a,$update = 0, $load = false) {
 
 	$o .= conversation($a,$items,'search',$update,'client');
 
+	$o .= '</div>';
+
 	return $o;
 }
 

view/css/mod_connections.css

@@ -1,4 +1,3 @@
-
 .search-input {
 	padding: 4px 12px;
 	margin: 3px;
@@ -111,8 +110,8 @@
 
 .contact-entry-wrapper {
 	float: left;
-	width: 120px;
-	height: 150px;
+	width: auto;
+	height: auto;
 	padding: 10px;
 	margin: 8px 10px 0 0;
 	border-top: 1px solid #eee;
@@ -137,9 +136,14 @@
 	margin-left: 0px;
 	margin-right: 10px;
 	margin-bottom: 10px;
-	width: 120px;
-	height: 36px;
+	width: 147px;
+	height: auto;
 	overflow: hidden;
+	white-space: nowrap;
+}
+
+.contact-entry-name-end {
+	clear:both;
 }
 
 .contact-entry-end {

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>

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>

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>

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>

view/tpl/rating_form.tpl

@@ -19,4 +19,4 @@
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
-</form>
+</form>

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>