From 0ebce75c7d53d209e47f4549105d27bbf1b5052a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 13:09:04 +0100 Subject: [PATCH 01/12] css fixes to make jot look better with background colors or images --- view/css/conversation.css | 25 ++++++++++++++---- view/css/mod_photos.css | 2 +- view/theme/redbasic/css/style.css | 42 +++++++++---------------------- view/tpl/jot.tpl | 15 +++++------ view/tpl/photos_upload.tpl | 2 +- 5 files changed, 42 insertions(+), 44 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 9063ffa60..92eafb4aa 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -19,20 +19,30 @@ code { display:none; } +#jot-title-wrap, +#jot-pagetitle-wrap, +#jot-category-wrap { + border-bottom: 1px solid #ccc; +} + +#jot-attachment-wrap { + border-top: 1px solid #ccc; +} + #jot-title-wrap input, #jot-pagetitle-wrap input { - padding: 8px; - margin-bottom: 5px; + padding: 10px; } .profile-jot-text { height: 39px; - padding: 8px; + padding: 11px; width: 100%; } .jot-attachment { - padding: 8px; + border: 0px; + padding: 11px; width: 100%; } @@ -42,13 +52,18 @@ code { } #profile-jot-submit-wrapper { - margin-top: 10px; + border-top: 1px solid #ccc; + padding: 10px; } #profile-jot-perms-end { height: 30px; } +#profile-jot-form { + line-height: 1; +} + #profile-jot-wrapper { margin-bottom: 30px; } diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index ae250bc1c..72dd7ffe7 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -25,7 +25,7 @@ } #photos-upload-choose { - padding: 4px; + padding: 7px 10px; width: 100%; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5dca2785c..82b6d0277 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -295,7 +295,7 @@ footer { .vcard { margin-bottom: 10px; - padding: 10px; + padding: 0px 10px 10px 10px; background-color: rgba(254,254,254,0.5); border: 1px solid rgba(254,254,254,0.5); -moz-border-radius: $radiuspx; @@ -341,9 +341,7 @@ footer { #profile-photo-wrapper { width: 251px; height: 251px; - margin-top: -10px; margin-bottom: 10px; - border: 1px solid #ccc; border-radius: $radiuspx; } @@ -1142,7 +1140,6 @@ img.mail-conv-sender-photo { .jothidden { font-weight: bold; - border-radius: $radiuspx; } .jothidden input::-webkit-input-placeholder { @@ -1153,27 +1150,18 @@ img.mail-conv-sender-photo { font-weight: bold; } -.jothidden > input { - border: 1px solid transparent; - background-color: transparent; -} -.jothidden > input:hover, -.jothidden > input:focus { - border: 1px solid #cccccc; - background-color: #fff; -} + #profile-jot-wrapper { - background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); + background-color: rgba(254,254,254,1); + border: 1px solid #ccc; border-radius: $radiuspx; } #profile-jot-text { - color:#000; - border: 1px solid #cccccc; - -moz-border-radius: $radiuspx; + resize: vertical; + border-width: 0px; border-radius: $radiuspx; } @@ -1515,7 +1503,7 @@ nav .dropdown-menu { .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom: 3px solid $comment_item_colour; + border-bottom: 1px solid #ccc; } .section-content-info-wrapper { @@ -1709,9 +1697,8 @@ nav .badge.mail-update:hover { .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: 4px; + border-top-right-radius: 4px; } .nav-tabs.nav-justified > .active > a, @@ -1824,13 +1811,13 @@ nav .badge.mail-update:hover { /* Modified original CSS to match input in Redbasic */ .jothidden .bootstrap-tagsinput { - border-color: $bgcolour; - background-color: $bgcolour; + border: 0px solid transparent; + margin-bottom: 0px; box-shadow: none; display: inline-block; border-radius: $radiuspx; cursor: text; - padding: 0px 8px; + padding: 0px 10px; width: 100%; } @@ -1838,11 +1825,6 @@ nav .badge.mail-update:hover { font-size: 100%; } -.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { - border: 1px solid #ccc; - background-color: #fff; -} - /* Abusing theme-green is less work than makeing a new new one */ .theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 32a08a9b3..4f1ecfef2 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,3 +1,10 @@ +{{$mimeselect}} +{{$layoutselect}} +{{if $id_select}} +
+ {{$id_seltext}} {{$id_select}} +
+{{/if}}
{{if $parent}} @@ -17,13 +24,7 @@ {{if $showacl}}{{$acl}}{{/if}} - {{$mimeselect}} - {{$layoutselect}} - {{if $id_select}} -
- {{$id_seltext}} {{$id_select}} -
- {{/if}} + {{if $webpage}}
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 11a08204d..5bcef5dc1 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -26,7 +26,7 @@
{{include file="field_textarea.tpl" field=$body}}
-
+
{{if $lockstate}}
-
+ + - {{else}} + {{elseif $editmenu}} {{/if}} {{/if}} From 4df78b06cf1db2760afe10d5b905858df513d9b4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 15:11:15 +0100 Subject: [PATCH 09/12] fix padding --- view/css/mod_cloud.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index 76ac82690..ed07ceb6f 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -38,6 +38,6 @@ } #files-upload { - padding: 4px; + padding: 7px 10px; width: 100%; } From 7edc505c2f261924a72055dc66561764b5863324 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 1 Mar 2016 17:54:52 +0100 Subject: [PATCH 10/12] fix typo in postgres schema --- install/schema_postgres.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 0ff78e873..a7cd5875c 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -560,7 +560,7 @@ CREATE TABLE "iconfig" ( "k" text NOT NULL DEFAULT '', "v" text NOT NULL DEFAULT '', "sharing" int NOT NULL DEFAULT '0', - PRIMARY_KEY("id") + PRIMARY KEY("id") ); create index "iconfig_iid" on iconfig ("iid"); create index "iconfig_cat" on iconfig ("cat"); From 966d1586c084a1c03c0c22c45efa26c1e7704d5b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 20:40:11 +0100 Subject: [PATCH 11/12] fix js error and add id to field input block --- view/tpl/events-js.tpl | 2 +- view/tpl/field_input.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 08c8aa64a..c29d80347 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,7 +1,7 @@
- +
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 128bbfbe1..d6a7f56b2 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,4 +1,4 @@ -
+
{{$field.3}} From 7206e8af3a943b0fb286f253ed3abbda2d2572b6 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 1 Mar 2016 22:08:50 +0100 Subject: [PATCH 12/12] Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels) --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/widgets.php b/include/widgets.php index a995fdf1c..aa0be87d6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1197,7 +1197,7 @@ function widget_forums($arr) { $perms_sql = item_permissions_sql(local_channel()) . item_normal(); - $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and abook_channel = %d order by xchan_name $limit ", + $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ", intval(PERMS_W_TAGWALL), intval(PERMS_W_STREAM), intval(local_channel())