diff options
| -rw-r--r-- | mod/search.php | 4 | ||||
| -rw-r--r-- | view/css/mod_connections.css | 14 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/lostpass.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/prep.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/rating_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/rmagic.tpl | 2 |
8 files changed, 24 insertions, 16 deletions
diff --git a/mod/search.php b/mod/search.php index ce8357fb9..a0085fca9 100644 --- a/mod/search.php +++ b/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; } diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index 097027179..d5c9b3d4f 100644 --- a/view/css/mod_connections.css +++ b/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 { 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/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/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/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> |