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

Merge pull request #207 from git-marijus/master

Browse Source 
search should respect max items to load as well
This commit is contained in:
friendica 2013-11-23 00:17:55 -08:00
commit a7536b117f
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/search.php
View File

@ -186,6 +186,8 @@ function search_content(&$a,$update = 0, $load = false) {
$pub_sql = public_permissions_sql(get_observer_hash()); $pub_sql = public_permissions_sql(get_observer_hash());
if(($update) && ($load)) { if(($update) && ($load)) {
$itemspage = get_pconfig(local_user(),'system','itemspage');
$a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) { if($load) {

17
view/theme/redbasic/css/style.css
View File

@ -51,8 +51,13 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
} }
input[type=text] { input[type="text"],
input[type="password"],
input[type="submit"],
select,
textarea {
font-family: arial,freesans,sans-serif; font-family: arial,freesans,sans-serif;
font-size: $body_font_size;
} }
input { input {
@ -60,7 +65,6 @@ input {
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;
padding: 3px; padding: 3px;
font-size: $body_font_size;
} }
input[type="submit"] { input[type="submit"] {
@ -458,9 +462,9 @@ footer {
clear: both; clear: both;
} }
#register-link, #lost-password-link { #register-link,
#lost-password-link {
float: left; float: left;
font-size: 90%;
margin-left: 100px; margin-left: 100px;
} }
@ -1459,6 +1463,7 @@ tr.mceLast {
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;
} }
#profile-jot-text:hover { #profile-jot-text:hover {
color: #000000; color: #000000;
} }
@ -2541,7 +2546,7 @@ brain is weird like that */
.field label { .field label {
float: left; float: left;
width: 200px; width: 350px;
} }
.field input, .field input,
@ -2551,7 +2556,7 @@ brain is weird like that */
.field textarea { height: 100px; } .field textarea { height: 100px; }
.field_help { .field_help {
display: block; display: block;
margin-left: 200px; margin-left: 350px;
color: #666666; color: #666666;
} }

2
view/tpl/field_input.tpl
View File

@ -1,6 +1,6 @@
<div class='field input'> <div class='field input'>
<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
<div id='end_{{$field.0}}' class='field_end'></div> <div id='end_{{$field.0}}' class='field_end'></div>
</div> </div>

2
view/tpl/jot.tpl
View File

@ -24,7 +24,7 @@
<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div> <div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
{{/if}} {{/if}}
<div id="jot-text-wrap"> <div id="jot-text-wrap">
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
</div> </div>
<div id="profile-jot-text-loading"></div> <div id="profile-jot-text-loading"></div>