From 3a4c32475e33e1cad6610c8e4fa0e9cc18bbc31a Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 14:17:47 +0100 Subject: search should respect max items to load as well --- mod/search.php | 2 ++ 1 file changed, 2 insertions(+) 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) { -- cgit v1.2.3 From 72e0bd6b28fbb2e13a02573a053430493f97c14b Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 21:19:41 +0100 Subject: missing input type and use same font for password and text input --- view/theme/redbasic/css/style.css | 7 ++++--- view/tpl/field_input.tpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f5e99bdf7..72413f283 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -51,7 +51,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } } -input[type=text] { +input[type=text], +input[type=password] { font-family: arial,freesans,sans-serif; } @@ -458,9 +459,9 @@ footer { clear: both; } -#register-link, #lost-password-link { +#register-link, +#lost-password-link { float: left; - font-size: 90%; margin-left: 100px; } 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 @@
- {{if $field.4}} {{$field.4}} {{/if}} + {{if $field.4}} {{$field.4}} {{/if}} {{$field.3}}
-- cgit v1.2.3 From 45c10d6d0a4a971446390137676fe8c00712372b Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 22:23:25 +0100 Subject: use same font for textarea aswell and some simplification --- view/theme/redbasic/css/style.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 72413f283..bdf1fb5fd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -51,9 +51,12 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } } -input[type=text], -input[type=password] { +input[type="text"], +input[type="password"], +input[type="submit"], +textarea { font-family: arial,freesans,sans-serif; + font-size: $body_font_size; } input { @@ -61,14 +64,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 { @@ -1456,10 +1458,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; } -- cgit v1.2.3 From adad1b75cd1fb6ef96e06d32ee5c2d89cd9e759b Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 01:10:54 +0100 Subject: use placeholder for profile-jot-text and some minor alignment --- view/theme/redbasic/css/style.css | 7 ++++--- view/tpl/jot.tpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bdf1fb5fd..97f24c8df 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -54,6 +54,7 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } input[type="text"], input[type="password"], input[type="submit"], +select, textarea { font-family: arial,freesans,sans-serif; font-size: $body_font_size; @@ -1464,7 +1465,7 @@ tr.mceLast { } #profile-jot-text:hover { - color: #000000; + color: #000000; } #profile-jot-text-loading { @@ -2545,7 +2546,7 @@ brain is weird like that */ .field label { float: left; - width: 200px; + width: 350px; } .field input, @@ -2555,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/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 @@
{{/if}}
- +
-- cgit v1.2.3 From 7f6f4d2e9e5ff0486382c41c76f6eac87af37ef2 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 01:12:30 +0100 Subject: typo --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 97f24c8df..8c9266f62 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1465,7 +1465,7 @@ tr.mceLast { } #profile-jot-text:hover { - color: #000000; + color: #000000; } #profile-jot-text-loading { -- cgit v1.2.3