aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-06-18 08:55:49 +0000
committerMario <mario@mariovavti.com>2021-06-18 08:55:49 +0000
commitf4f9ccc3b234eaadf29b3f5c8bec6e19de0aa761 (patch)
treeb87d87381af0299690790ac371d093e5fd8784f7
parenta84cec4acddf6804a88fcda52e4437c91785dfb2 (diff)
downloadvolse-hubzilla-f4f9ccc3b234eaadf29b3f5c8bec6e19de0aa761.tar.gz
volse-hubzilla-f4f9ccc3b234eaadf29b3f5c8bec6e19de0aa761.tar.bz2
volse-hubzilla-f4f9ccc3b234eaadf29b3f5c8bec6e19de0aa761.zip
css fixes
-rw-r--r--Zotlabs/Widget/Hq_controls.php7
-rw-r--r--include/html2plain.php10
-rw-r--r--view/pdl/mod_hq.pdl6
-rw-r--r--view/tpl/hq_controls.tpl4
-rw-r--r--view/tpl/messages_widget.tpl3
5 files changed, 17 insertions, 13 deletions
diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php
index 8b532defe..9504b8f9e 100644
--- a/Zotlabs/Widget/Hq_controls.php
+++ b/Zotlabs/Widget/Hq_controls.php
@@ -17,7 +17,7 @@ class Hq_controls {
'label' => t('Toggle post editor'),
'id' => 'jot-toggle',
'href' => '#',
- 'class' => 'btn btn-outline-primary',
+ 'class' => 'btn',
'type' => 'button',
'icon' => 'pencil',
'extra' => 'data-toggle="button"'
@@ -29,7 +29,7 @@ class Hq_controls {
'label' => t('Toggle personal notes'),
'id' => 'notes-toggle',
'href' => '#',
- 'class' => 'btn btn-outline-primary',
+ 'class' => 'btn',
'type' => 'button',
'icon' => 'sticky-note-o',
'extra' => 'data-toggle="button"'
@@ -39,7 +39,8 @@ class Hq_controls {
return replace_macros(get_markup_template('hq_controls.tpl'),
[
'$entries' => $entries,
- '$wrapper_class' => $options['class']
+ '$wrapper_class' => $options['wrapper_class'],
+ '$entry_class' => $options['entry_class']
]
);
}
diff --git a/include/html2plain.php b/include/html2plain.php
index bf8581bdb..48bbe3d9e 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -78,10 +78,10 @@ function quotelevel($message, $wraplength = 75)
function collecturls($message) {
-
+
$pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
-
+
$urls = [];
if ($result) {
$ignore = false;
@@ -104,15 +104,15 @@ function collecturls($message) {
foreach ($list as $listitem)
if (strpos($treffer[1], $listitem) !== false)
$ignore = true;
-
+
if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
$ignore = false;
-
+
if (! $ignore)
$urls[$treffer[1]] = $treffer[1];
}
}
-
+
return($urls);
}
diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl
index ff44b2df9..e078773f0 100644
--- a/view/pdl/mod_hq.pdl
+++ b/view/pdl/mod_hq.pdl
@@ -1,7 +1,8 @@
[region=aside]
[widget=messages][/widget]
[widget=hq_controls]
- [var=class]d-none d-lg-block[/var]
+ [var=wrapper_class]d-none d-lg-block[/var]
+ [var=entry_class]btn-outline-primary[/var]
[/widget]
[/region]
[region=content]
@@ -11,7 +12,8 @@
[/widget]
$content
[widget=hq_controls]
- [var=class]hq_controls_fixed_bottom_center d-lg-none[/var]
+ [var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
+ [var=entry_class]btn-primary shadow[/var]
[/widget]
[/region]
[region=right_aside]
diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl
index 87accb5e0..333e21863 100644
--- a/view/tpl/hq_controls.tpl
+++ b/view/tpl/hq_controls.tpl
@@ -1,6 +1,6 @@
-<div class="d-grid gap-2 mb-3{{if $wrapper_class}} {{$wrapper_class}}{{/if}}">
+<div class="mb-3{{if $wrapper_class}} {{$wrapper_class}}{{/if}}">
{{foreach $entries as $e}}
- <button id="{{$e.id}}" class="{{$e.class}} rounded-circle" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}>
+ <button id="{{$e.id}}" class="{{$e.class}} rounded-circle mr-1{{if $entry_class}} {{$entry_class}}{{/if}}" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}>
{{if $e.icon}}<i class="fa fa-{{$e.icon}}"></i>{{/if}}
</button>
{{/foreach}}
diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl
index d3dbd7be9..6670faa60 100644
--- a/view/tpl/messages_widget.tpl
+++ b/view/tpl/messages_widget.tpl
@@ -61,7 +61,7 @@
$('#messages-widget').on('scroll', function() {
if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) {
- get_messages_page('hq');
+ get_messages_page();
}
});
@@ -79,6 +79,7 @@
$('.message[data-b64mid=\'' + bParam_mid + '\']').addClass('active');
function get_messages_page() {
+
if (get_messages_page_active)
return;