Merge pull request #207 from git-marijus/master

search should respect max items to load as well

4 files changed, 17 insertions, 10 deletions

diff --git a/mod/search.php b/mod/search.php
index 539241268..bad071936 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -186,6 +186,8 @@ function search_content(&$a,$update = 0, $load = false) {
 	$pub_sql = public_permissions_sql(get_observer_hash());
 
 	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']));
 
 		if($load) {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f5e99bdf7..8c9266f62 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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-size: $body_font_size;
 }
 
 input {
@@ -60,14 +65,13 @@ input {
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 	padding: 3px;
-	font-size: $body_font_size;
 }
 
 input[type="submit"] {
 	background-color: #F0F0F0;
 	font-weight: bold;
 	color: #0080FF; 
-	text-decoration: none; 
+	text-decoration: none;
 }
 
 code {
@@ -458,9 +462,9 @@ footer {
 	clear: both;
 }
 
-#register-link, #lost-password-link {
+#register-link,
+#lost-password-link {
 	float: left;
-	font-size: 90%;
 	margin-left: 100px;
 }
 
@@ -1455,10 +1459,11 @@ tr.mceLast {
 	border: 1px solid #cccccc;
 	padding: 8px;
 	margin-right: 0px;
-	width: 90%; 
+	width: 90%;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 }
+
 #profile-jot-text:hover {
 	color: #000000;
 }
@@ -2541,7 +2546,7 @@ brain is weird like that */
 
 .field label {
 	float: left;
-	width: 200px;
+	width: 350px;
 }
 
 .field input,
@@ -2551,7 +2556,7 @@ brain is weird like that */
 .field textarea { height: 100px; }
 .field_help {
 	display: block;
-	margin-left: 200px;
+	margin-left: 350px;
 	color: #666666;
 	
 }
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index d5b3d6b4e..a584f95e7 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,6 +1,6 @@
 	<div class='field input'>
 		<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>
 		<div id='end_{{$field.0}}' class='field_end'></div>
 	</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index ef91f45be..b9238f0c0 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -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>
 		{{/if}}
 		<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 id="profile-jot-text-loading"></div>