diff options
| -rw-r--r-- | Zotlabs/Module/Notifications.php | 2 | ||||
| -rw-r--r-- | view/de-de/hstrings.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rw-r--r-- | view/tpl/micropro_card.tpl | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php index dfa007548..1762ad5f6 100644 --- a/Zotlabs/Module/Notifications.php +++ b/Zotlabs/Module/Notifications.php @@ -41,8 +41,6 @@ class Notifications extends \Zotlabs\Web\Controller { $notifications_available = 1; foreach ($r as $rr) { $x = strip_tags(bbcode($rr['msg'])); - if(strpos($x,',')) - $x = substr($x,strpos($x,',')+1); $notif_content .= replace_macros(get_markup_template('notify.tpl'),array( '$item_link' => z_root().'/notify/view/'. $rr['id'], '$item_image' => $rr['photo'], diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php index 749afef5d..884267319 100644 --- a/view/de-de/hstrings.php +++ b/view/de-de/hstrings.php @@ -277,7 +277,7 @@ App::$strings["Name or caption"] = "Name oder Titel"; App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "; App::$strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen"; App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"; -App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellungen"; +App::$strings["Channel role and privacy"] = "Kanaltyp und Privatsphäre-Einstellungen"; App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."; App::$strings["Read more about roles"] = "Mehr Informationen über Rollen"; App::$strings["Create Channel"] = "Einen neuen Kanal anlegen"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6ffccb4e9..970e4bc89 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1152,7 +1152,6 @@ img.mail-conv-sender-photo { .wall-item-ago, .dropdown-sub-text { color: #777; - display: block; } .wall-item-content, diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl index c1b621349..a3c693dbd 100644 --- a/view/tpl/micropro_card.tpl +++ b/view/tpl/micropro_card.tpl @@ -1,6 +1,5 @@ <a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}> <img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}} <span class="contactname">{{$name}}</span> - <span class="dropdown-sub-text">{{$addr}}</span> - <span class="dropdown-sub-text">{{$network}}</span> + <span class="dropdown-sub-text">{{$addr}}<br>{{$network}}</span> </a> |