aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/de-de/hstrings.php2
-rw-r--r--view/js/main.js51
-rw-r--r--view/ru/hstrings.php2
-rw-r--r--view/theme/redbasic/php/config.php12
-rw-r--r--view/tpl/navbar_default.tpl10
-rw-r--r--view/tpl/profile_vcard.tpl6
-rw-r--r--view/tpl/xchan_vcard.tpl6
7 files changed, 44 insertions, 45 deletions
diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php
index df3e25bb8..79fb84bf4 100644
--- a/view/de-de/hstrings.php
+++ b/view/de-de/hstrings.php
@@ -1832,7 +1832,7 @@ App::$strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse
App::$strings["Your old login password"] = "Dein altes Passwort";
App::$strings["Import your items and files (limited by available memory)"] = "Importieren Sie Ihre Objekte und Dateien (begrenzt durch den verfügbaren Speicher)";
App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
-App::$strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
+App::$strings["Make this hub my primary location"] = "Dieser \$Projectname-Hub ist mein primärer Hub.";
App::$strings["Move this channel (disable all previous locations)"] = "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)";
App::$strings["Use this channel nickname instead of the one provided"] = "Benutze diese Kanal-Kennung anstelle der hinterlegten.";
App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Leerlassen, um die existierende Kanal-Kennung beizubehalten. Es wird eine vergleichbare Kennung zufällig zugewiesen, falls der Name schon auf dieser Seite belegt ist.";
diff --git a/view/js/main.js b/view/js/main.js
index 70a83de33..aff6eab4d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -56,6 +56,30 @@ if ('serviceWorker' in navigator) {
$.ajaxSetup({cache: false});
+var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
+
+jQuery.timeago.settings.strings = {
+ prefixAgo : aStr['t01'],
+ prefixFromNow : aStr['t02'],
+ suffixAgo : aStr['t03'],
+ suffixFromNow : aStr['t04'],
+ seconds : aStr['t05'],
+ minute : aStr['t06'],
+ minutes : function(value){return tf(value, aStr['t07']);},
+ hour : aStr['t08'],
+ hours : function(value){return tf(value, aStr['t09']);},
+ day : aStr['t10'],
+ days : function(value){return tf(value, aStr['t11']);},
+ month : aStr['t12'],
+ months : function(value){return tf(value, aStr['t13']);},
+ year : aStr['t14'],
+ years : function(value){return tf(value, aStr['t15']);},
+ wordSeparator : aStr['t16'],
+ numbers : aStr['t17'],
+};
+
+jQuery.timeago.settings.allowFuture = true;
+
$(document).ready(function() {
$(document).on('click focus', '.comment-edit-form', handle_comment_form);
@@ -139,30 +163,6 @@ $(document).ready(function() {
});
// @hilmar <-|
- var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
-
- jQuery.timeago.settings.strings = {
- prefixAgo : aStr['t01'],
- prefixFromNow : aStr['t02'],
- suffixAgo : aStr['t03'],
- suffixFromNow : aStr['t04'],
- seconds : aStr['t05'],
- minute : aStr['t06'],
- minutes : function(value){return tf(value, aStr['t07']);},
- hour : aStr['t08'],
- hours : function(value){return tf(value, aStr['t09']);},
- day : aStr['t10'],
- days : function(value){return tf(value, aStr['t11']);},
- month : aStr['t12'],
- months : function(value){return tf(value, aStr['t13']);},
- year : aStr['t14'],
- years : function(value){return tf(value, aStr['t15']);},
- wordSeparator : aStr['t16'],
- numbers : aStr['t17'],
- };
-
- jQuery.timeago.settings.allowFuture = true;
-
$(document).on('click', '.notification, .message', function(e) {
let b64mid = this.dataset.b64mid;
let notify_id = this.dataset.notify_id;
@@ -221,9 +221,6 @@ $(document).ready(function() {
};
- //mod_mail only
- $(".mail-conv-detail .autotime").timeago();
-
savedTitle = document.title;
updateInit();
diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php
index 351c89383..4479188cb 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -1138,7 +1138,7 @@ App::$strings["This website expires after %d days."] = "Срок хранени
App::$strings["This website does not expire imported content."] = "Срок хранения импортированного содержимого этого сайта не ограничен.";
App::$strings["The website limit takes precedence if lower than your limit."] = "Ограничение сайта имеет приоритет если ниже вашего значения.";
App::$strings["Do not import posts with this text"] = "Не импортировать публикации с этим текстом";
-App::$strings["Words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = "Слова, по одному на строку, или #теги, $категории, /шаблоны/, lang=xx, lang!=xx - оставьте пустым для импорта всех публикаций";
+App::$strings["Words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = "Слова, по одному на строку, или #теги, \$категории, /шаблоны/, lang=xx, lang!=xx - оставьте пустым для импорта всех публикаций";
App::$strings["Only import posts with this text"] = "Импортировать публикации только с этим текстом";
App::$strings["Connections Settings"] = "Настройки контактов";
App::$strings["No feature settings configured"] = "Параметры функций не настроены";
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 9d242fab0..65834526d 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -89,10 +89,12 @@ class RedbasicConfig {
function form($arr) {
- if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming'))
- $expert = 1;
+ $expert = false;
+ if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming')) {
+ $expert = true;
+ }
- $o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
+ $o = replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'),
'$baseurl' => z_root(),
'$theme' => \App::$channel['channel_theme'],
@@ -102,8 +104,8 @@ class RedbasicConfig {
'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
- '$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colour),
- '$link_hover_colour' => array('redbasic_link_hover_colour', t('Link hover color'), $arr['link_hover_colour'], '', $link_hover_colour),
+ '$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour']),
+ '$link_hover_colour' => array('redbasic_link_hover_colour', t('Link hover color'), $arr['link_hover_colour']),
'$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 06e764a54..4861c196f 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -181,12 +181,12 @@
</div>
<div class="nav d-lg-flex"></div>
{{else}}
- <div class="lh-1" id="app-bin-label">
+ <div class="lh-sm w-100" id="app-bin-label">
{{if $name}}
- <img src="{{$thumb}}" class="menu-img-2">
- <div class="float-start pe-2">
- <div class="fw-bold">{{$name}}</div>
- <div class="text-muted">{{$sitelocation}}</div>
+ <img src="{{$thumb}}" class="menu-img-3">
+ <div class="p-1">
+ <div class="fn text-truncate">{{$name}}</div>
+ <div class="text-muted text-truncate">{{$sitelocation}}</div>
</div>
{{/if}}
</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 3da580f60..beec6b3a0 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -23,14 +23,14 @@
<a class="profile-edit-side-link float-end" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
{{/if}}
- <div class="text-truncate">
+ <div class="text-truncate lh-sm">
<strong class="fn p-name">{{$profile.fullname}}{{if $profile.online}}<i class="fa fa-fw fa-asterisk text-danger ps-2" title="{{$profile.online}}"></i>{{/if}}</strong>
</div>
<div class="text-truncate">
- <small class="text-muted p-adr">{{$profile.reddress}}</small>
+ <span class="text-muted p-adr">{{$profile.reddress}}</span>
</div>
{{if $connect}}
- <div class="mt-1">
+ <div class="mt-2">
<a href="{{$connect_url}}" class="btn btn-success btn-sm" rel="nofollow">
<i class="fa fa-plus"></i> {{$connect}}
</a>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index a5568f283..473cda7ad 100644
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -5,15 +5,15 @@
<img class="u-photo rounded-start" src="{{$photo}}" alt="{{$name}}" style="width: 6rem; height:6rem;">
</a>
</div>
- <div class="col-7 m-1 p-0">
+ <div class="col-7 m-1 p-0 lh-sm">
<div class="text-truncate">
<strong class="fn p-name">{{$name}}</strong>
</div>
<div class="text-truncate">
- <small class="text-muted p-adr">{{$addr}}</small>
+ <span class="text-muted p-adr">{{$addr}}</span>
</div>
{{if $connect}}
- <div class="mt-1">
+ <div class="mt-2">
<a href="follow?f=&url={{$follow}}&interactive=1" class="btn btn-success btn-sm" rel="nofollow">
<i class="fa fa-plus"></i> {{$connect}}
</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 21:49:05 +0000