diff options
| author | Mario <mario@mariovavti.com> | 2021-01-27 10:25:26 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-27 10:25:26 +0000 |
| commit | 15c90371e05b9e8132ec424a08de45f1b6b80a18 (patch) | |
| tree | a75668866a78642ca61db0cddd37f22a68300d58 | |
| parent | a2728167bc6431ddfca7c4873e05d70fc0937f7e (diff) | |
| parent | 00fe7bb1bbe6c1b49f66bc0e0c2330798608ce95 (diff) | |
| download | volse-hubzilla-15c90371e05b9e8132ec424a08de45f1b6b80a18.tar.gz volse-hubzilla-15c90371e05b9e8132ec424a08de45f1b6b80a18.tar.bz2 volse-hubzilla-15c90371e05b9e8132ec424a08de45f1b6b80a18.zip | |
Merge branch 'customjotheaders' into 'dev'
Custom "headers" in item creation form.
See merge request hubzilla/core!1901
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | view/css/conversation.css | 6 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 002edef51..08d16a413 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1517,6 +1517,7 @@ function hz_status_editor($a, $x, $popup = false) { '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0), '$reset' => $reset, '$is_owner' => ((local_channel() && (local_channel() == $x['profile_uid'])) ? true : false), + '$customjotheaders' => '', '$custommoretoolsdropdown' => '', '$custommoretoolsbuttons' => '', '$customsubmitright' => [] diff --git a/view/css/conversation.css b/view/css/conversation.css index 77e56e200..06da8528c 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -18,7 +18,8 @@ #jot-title-wrap, #jot-pagetitle-wrap, -#jot-category-wrap { +#jot-category-wrap, +#jot-customjotheaders-wrap { border-bottom: 1px solid rgba(0, 0, 0, .2); } @@ -28,7 +29,8 @@ } #jot-title-wrap input, -#jot-pagetitle-wrap input { +#jot-pagetitle-wrap input, +#jot-customjotheaders-wrap { padding: 0.5rem; } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 36543ccfa..36e71223c 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -41,6 +41,11 @@ <input class="w-100 border-0" name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput"> </div> {{/if}} + {{if $customjotheaders}} + <div id="jot-customjotheaders-wrap" class="jothidden"> + {{$customjotheaders}} + </div> + {{/if}} <div id="jot-text-wrap"> <div id="profile-jot-tools" class="btn-group d-none"> {{if $is_owner}} |