diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/de-de/hstrings.php | 2 | ||||
| -rw-r--r-- | view/js/main.js | 3 | ||||
| -rw-r--r-- | view/js/mod_mail.js | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/micropro_card.tpl | 3 |
7 files changed, 8 insertions, 8 deletions
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/js/main.js b/view/js/main.js index 45c412296..17f94dd16 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -62,6 +62,9 @@ $(document).ready(function() { numbers : aStr['t17'], }; + //mod_mail only + $(".mail-conv-detail .autotime").timeago(); + savedTitle = document.title; updateInit(); diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index 15a45519b..917e5414c 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -2,7 +2,6 @@ $(document).ready(function() { $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { $("#recip-complete").val(data.xid); }); - $(".autotime").timeago() $('#prvmail-text').bbco_autocomplete('bbcode'); - $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); + $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); }); 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/mail_conv.tpl b/view/tpl/mail_conv.tpl index 759517b7f..cd810e999 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -6,7 +6,7 @@ <div class="mail-conv-detail"> {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} <div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> - <div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> + <div class="autotime wall-item-ago" title="{{$mail.date}}"></div> </div> </div> <div class="clearfix mail-conv-content"> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 65d8dcdb4..a1784e1e6 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -2,6 +2,6 @@ <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}"> <span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br> <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> - <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> + <span class="wall-item-ago autotime" title="{{$message.date}}"></span> </a> </li> 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> |