From 99247d0c592658d2ebce549c97c06080e98c584f Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 5 Mar 2018 20:42:06 -0500 Subject: Improve rendering of Readme files in plugin settings --- view/css/mod_admin.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'view') diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css index 409744402..5e22fc90c 100644 --- a/view/css/mod_admin.css +++ b/view/css/mod_admin.css @@ -70,3 +70,21 @@ margin-top: 0px !important; margin-left: 0px !important; } + +pre code { + background: #F5F5F5; + font-family: Courier, monospace; + font-size: 1em; + padding: 1em 1.5em; + display: block; + white-space: pre-wrap; +} + +code { + background: #F5F5F5; + font-family: Courier, monospace; + font-size: 1em; + display: inline; + padding: 0.2em 0.2em; + white-space: pre-wrap; +} \ No newline at end of file -- cgit v1.2.3 From 04f7f99fc3ac68b5cea357b35a7d755f62fb999b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Mar 2018 20:29:37 +0100 Subject: we do not support separate mobile themes anymore --- view/tpl/admin_site.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 78e3ee245..10b367810 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -55,7 +55,7 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} + {{* include file="field_select.tpl" field=$theme_mobile *}} {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} -- cgit v1.2.3 From d6812cf75e40ca5a364c5832929b2eaf62c0d2f5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Mar 2018 20:47:18 +0100 Subject: more bootstrap accordion fixes --- view/tpl/admin_settings_features.tpl | 4 ++-- view/tpl/profile_edit.tpl | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl index 2d5cf7e0b..86f978e08 100644 --- a/view/tpl/admin_settings_features.tpl +++ b/view/tpl/admin_settings_features.tpl @@ -9,12 +9,12 @@
-
+
{{foreach $f.1 as $fcat}} {{include file="field_checkbox.tpl" field=$fcat.0}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 05137479f..95183fdf4 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -49,12 +49,12 @@
-
+
{{include file="field_input.tpl" field=$profile_name}} @@ -215,12 +215,12 @@
-
+
{{if $fields.address}} {{include file="field_input.tpl" field=$address}} @@ -260,12 +260,12 @@
-
+
{{if $fields.marital }}
@@ -307,12 +307,12 @@
-
+
{{if $fields.homepage}} {{include file="field_input.tpl" field=$homepage}} -- cgit v1.2.3 From 17c102ebe115bd8272da830bf9523b691ce115ee Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Mar 2018 21:11:57 +0100 Subject: we need the javascript in the template since strings are involved --- view/js/mod_cover_photo.js | 80 ----------------------------------------- view/js/mod_profile_photo.js | 82 ------------------------------------------ view/tpl/cover_photo.tpl | 83 ++++++++++++++++++++++++++++++++++++++++++ view/tpl/profile_photo.tpl | 86 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+), 162 deletions(-) delete mode 100644 view/js/mod_cover_photo.js delete mode 100644 view/js/mod_profile_photo.js (limited to 'view') diff --git a/view/js/mod_cover_photo.js b/view/js/mod_cover_photo.js deleted file mode 100644 index 5b64b8b91..000000000 --- a/view/js/mod_cover_photo.js +++ /dev/null @@ -1,80 +0,0 @@ - var initializeEmbedPhotoDialog = function () { - $('.embed-photo-selected-photo').each(function (index) { - $(this).removeClass('embed-photo-selected-photo'); - }); - getPhotoAlbumList(); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('show'); - }; - - var choosePhotoFromAlbum = function (album) { - $.post("embedphotos/album", {name: album}, - function(data) { - if (data['status']) { - $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); - $('#embedPhotoModalBodyAlbumDialog').html('\ - ') - $('#embedPhotoModalBodyAlbumDialog').append(data['content']); - $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { - evt.preventDefault(); - var image = document.getElementById(evt.target.id); - if (typeof($(image).parent()[0]) !== 'undefined') { - var imageparent = document.getElementById($(image).parent()[0].id); - $(imageparent).toggleClass('embed-photo-selected-photo'); - var href = $(imageparent).attr('href'); - $.post("embedphotos/photolink", {href: href}, - function(ddata) { - if (ddata['status']) { - window.location.href = 'cover_photo/use/' + ddata['resource_id']; - } else { - window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); - } - return false; - }, - 'json'); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); - } - }); - - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; - - var getPhotoAlbumList = function () { - $.post("embedphotos/albumlist", {}, - function(data) { - if (data['status']) { - var albums = data['albumlist']; //JSON.parse(data['albumlist']); - $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('
    '); - for(var i=0; i' + albumName + ''; - albumLink += ''; - $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); - } - $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js deleted file mode 100644 index c05c8e25e..000000000 --- a/view/js/mod_profile_photo.js +++ /dev/null @@ -1,82 +0,0 @@ - var initializeEmbedPhotoDialog = function () { - $('.embed-photo-selected-photo').each(function (index) { - $(this).removeClass('embed-photo-selected-photo'); - }); - getPhotoAlbumList(); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('show'); - }; - - var choosePhotoFromAlbum = function (album) { - $.post("embedphotos/album", {name: album}, - function(data) { - if (data['status']) { - $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); - $('#embedPhotoModalBodyAlbumDialog').html('\ - ') - $('#embedPhotoModalBodyAlbumDialog').append(data['content']); - $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { - evt.preventDefault(); - var image = document.getElementById(evt.target.id); - if (typeof($(image).parent()[0]) !== 'undefined') { - var imageparent = document.getElementById($(image).parent()[0].id); - $(imageparent).toggleClass('embed-photo-selected-photo'); - var href = $(imageparent).attr('href'); - $.post("embedphotos/photolink", {href: href}, - function(ddata) { - if (ddata['status']) { - var pf = $('#profile-photo-profiles').val(); - var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : ''); - window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof; - } else { - window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); - } - return false; - }, - 'json'); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); - } - }); - - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; - - var getPhotoAlbumList = function () { - $.post("embedphotos/albumlist", {}, - function(data) { - if (data['status']) { - var albums = data['albumlist']; //JSON.parse(data['albumlist']); - $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('
      '); - for(var i=0; i' + albumName + ''; - albumLink += ''; - $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); - } - $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index cbcf46320..829a3a556 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -1,3 +1,86 @@ + +

      {{$title}}

      diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index edde6af3f..e48d05330 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,3 +1,89 @@ + + +

      {{$title}}

      -- cgit v1.2.3 From 48b1042347d098672e583010fe9dbf71eb81623c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 7 Mar 2018 16:59:55 -0800 Subject: hashtag autocomplete --- view/js/autocomplete.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 01def9900..2d017db18 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -74,6 +74,10 @@ function bbco_format(item) { return "
      " + item + "
      "; } +function tag_format(item) { + return "
      " + '#' + item.text + "
      "; +} + function editor_replace(item) { if(typeof item.replace !== 'undefined') { return '$1$2' + item.replace; @@ -202,6 +206,16 @@ function string2bb(element) { }; + // Autocomplete hashtags + tags = { + match: /(^|\s)(\#)([^ \n]{2,})$/, + index: 3, + search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, + replace: function(item) { return "$1$2" + item.text + ' '; }, + template: tag_format + }; + + smilies = { match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, @@ -211,7 +225,7 @@ function string2bb(element) { template: smiley_format }; this.attr('autocomplete','off'); - this.textcomplete([contacts,forums,smilies], {className:'acpopup', zIndex:1020}); + this.textcomplete([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); }; })( jQuery ); -- cgit v1.2.3 From 7ac70e1f2375b4a320c27ca4e50f75ee0b958fe4 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Thrar\" Bacou" Date: Thu, 8 Mar 2018 20:14:44 +0100 Subject: Fix code background in wiki pages Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7 --- view/theme/redbasic/schema/dark.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 0a142a07f..98e2bac9a 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -343,6 +343,10 @@ pre { border:1px solid #090909; } +#wiki-content-container code { + background: #000; +} + .notif-item a { color: #ccc; } -- cgit v1.2.3 From 76a80060034b381ac14d9d897b18c9d650347dd8 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 20:56:23 +0100 Subject: Fix background of tags field --- view/theme/redbasic/schema/dark.css | 38 ++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 98e2bac9a..edc6e5f65 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -20,8 +20,18 @@ textarea, input, select margin-bottom: 5px; } +#jot-category-wrap { + background: #000; + border-bottom: none; + margin-bottom: 5px; +} + +.bootstrap-tagsinput { + background: #333; +} + optgroup { - color: #CCC !important; + color: #CCC !important; } option { @@ -132,7 +142,7 @@ option { .abook-self { border: 1px solid #222; color: #555; - background-color:#111; + background-color:#111; } .modal-content { @@ -208,7 +218,7 @@ a.btn, aside a { } .btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus { color: #FFF !important; - background-color: #C9302C !important; + background-color: #C9302C !important; border-color: #AC2925 !important; } @@ -278,7 +288,7 @@ nav .dropdown-menu { border-bottom:1px solid #333; } -.nav-tabs .nav-link.active { +.nav-tabs .nav-link.active { color: #fff; background-color: #111; border-color: #333; @@ -297,7 +307,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { background-color: #222; } -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; } @@ -356,23 +366,23 @@ pre { } .dropdown-menu { - background-color: #222; + background-color: #222; } .dropdown-menu >li > a { - color: #ccc; + color: #ccc; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #ddd; - background-color: #333; + color: #ddd; + background-color: #333; background-image: none; } .open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { - color: #ccc; - background-color: #222; - border-color: #222; + color: #ccc; + background-color: #222; + border-color: #222; } .pmenu-item:hover a { @@ -448,7 +458,7 @@ pre { .profile-match-wrapper { - width: 150px; + width: 150px; height: 120px; border: none; } @@ -466,5 +476,3 @@ pre { .widget-nav-pills-checkbox:hover + a { background-color: #222; } - - -- cgit v1.2.3 From f9cca2422adb05db69c13ebd48d79e6108291d8f Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 21:02:51 +0100 Subject: Remove useless background spec for category field --- view/theme/redbasic/schema/dark.css | 1 - 1 file changed, 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index edc6e5f65..ebcfcdd13 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -21,7 +21,6 @@ textarea, input, select } #jot-category-wrap { - background: #000; border-bottom: none; margin-bottom: 5px; } -- cgit v1.2.3 From 500b141341451b5dcf31b7818c2e085cd7a98303 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 21:12:33 +0100 Subject: Uniformize title input with other input fields Add rounded corners to mimic categories input field and main text area. --- view/theme/redbasic/schema/dark.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ebcfcdd13..d0154bfb1 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -15,6 +15,10 @@ textarea, input, select padding: 10px 0; } +#jot-title { + border-radius: 3px; +} + #jot-title-wrap { border-bottom: none; margin-bottom: 5px; -- cgit v1.2.3 From 3ee35b83c2651b9c9ab6a27cab4ea6517375744f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 8 Mar 2018 14:23:34 -0800 Subject: notifications-btn-1 does not actually require the text-white class and this is known to cause issues on dark themes --- view/tpl/navbar_default.tpl | 2 +- view/tpl/navbar_tucson.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b0b3198c6..92b067bcb 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -80,7 +80,7 @@ {{if $localuser || $nav.pubs}} - {{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index b0b3198c6..92b067bcb 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -80,7 +80,7 @@ {{if $localuser || $nav.pubs}} - {{/if}} -- cgit v1.2.3