harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Vavti 2015-10-26 14:20:06 +01:00
commit 4fb9571136
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/search.php
View File

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

14
view/css/mod_connections.css
View File

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

1
view/tpl/connection_template.tpl
View File

@ -4,6 +4,7 @@
</div> </div>
<div class="contact-entry-photo-end" ></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> <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-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 class="contact-entry-end" ></div>
</div> </div>

7
view/tpl/lostpass.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper-styled">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<p id="lostpass-desc"> <p id="lostpass-desc">
@ -8,11 +9,9 @@
<div id="login-name-wrapper"> <div id="login-name-wrapper">
<label for="login-name" id="label-login-name">{{$name}}</label> <label for="login-name" id="label-login-name">{{$name}}</label>
<input type="text" maxlength="60" name="login-name" id="login-name" value="" /> <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>
<div id="login-extra-end"></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> <div id="login-submit-end"></div>
</form> </form>
</div>

3
view/tpl/myapps.tpl
View File

@ -1,7 +1,8 @@
<div class="generic-content-wrapper-styled">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
{{foreach $apps as $ap}} {{foreach $apps as $ap}}
{{$ap}} {{$ap}}
{{/foreach}} {{/foreach}}
<div class="clear"></div> <div class="clear"></div>
</div>

7
view/tpl/prep.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper-styled">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if $site}} {{if $site}}
@ -27,8 +28,4 @@
</div> </div>
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
</div>

2
view/tpl/rmagic.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper-styled">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<form action="rmagic" method="post" > <form action="rmagic" method="post" >
@ -9,3 +10,4 @@
<div id="rmagic-submit-end" class="rmagic-field-end"></div> <div id="rmagic-submit-end" class="rmagic-field-end"></div>
</form> </form>
</div>