From 5f9f03daf781b95b5685a19d450800aad879c0de Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 20 Mar 2011 19:29:01 -0700 Subject: [PATCH] simplify insecure network warning --- mod/contacts.php | 5 ++++- view/de/insecure_net.tpl | 8 -------- view/en/insecure_net.tpl | 6 ------ view/fr/insecure_net.tpl | 6 ------ view/it/insecure_net.tpl | 6 ------ view/sv/insecure_net.tpl | 6 ------ view/theme/duepuntozero/style.css | 16 ++++++++++++---- 7 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 view/de/insecure_net.tpl delete mode 100644 view/en/insecure_net.tpl delete mode 100644 view/fr/insecure_net.tpl delete mode 100644 view/it/insecure_net.tpl delete mode 100644 view/sv/insecure_net.tpl diff --git a/mod/contacts.php b/mod/contacts.php index 029330b7ab..c1455ec54d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -244,6 +244,9 @@ function contacts_content(&$a) { $sparkle = ''; } + $insecure = '

' . t('Privacy Unavailable') . ' ' + . t('Private communications are not available for this contact.') . '

'; + $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00') ? t('Never') : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')); @@ -266,7 +269,7 @@ function contacts_content(&$a) { '$contact_id' => $r[0]['id'], '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ), '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ), - '$insecure' => (($r[0]['network'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''), + '$insecure' => (($r[0]['network'] !== 'dfrn') ? $insecure : ''), '$info' => $r[0]['info'], '$blocked' => (($r[0]['blocked']) ? '
' . t('Currently blocked') . '
' : ''), '$ignored' => (($r[0]['readonly']) ? '
' . t('Currently ignored') . '
' : ''), diff --git a/view/de/insecure_net.tpl b/view/de/insecure_net.tpl deleted file mode 100644 index 900f286425..0000000000 --- a/view/de/insecure_net.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

-Das Soziale Netzwerk dem $name angehört ist ein offenes Netzwerk das nur -eingeschränkte oder nicht existente Privatspäreneinstellungen bietet. - -Bitte verhalte dich entsprechend diskret. -

-
diff --git a/view/en/insecure_net.tpl b/view/en/insecure_net.tpl deleted file mode 100644 index 5628639ccf..0000000000 --- a/view/en/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

-The social network that $name belongs to is an open network with limited or non-existent privacy controls. -Please use appropriate discretion. -

-
\ No newline at end of file diff --git a/view/fr/insecure_net.tpl b/view/fr/insecure_net.tpl deleted file mode 100644 index 4f413b14fa..0000000000 --- a/view/fr/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

-Le réseau social auquel $name appartient est un réseau ouvert ne disposant que d'un contrôle limité sur les éléments de la vie privée. -Gardez ceci à l'esprit, en fonction de vos besoins de discrétion. -

-
diff --git a/view/it/insecure_net.tpl b/view/it/insecure_net.tpl deleted file mode 100644 index 7ab6270ff6..0000000000 --- a/view/it/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

-Il social network a cui $name appartiene è una rete aperta con limitati o non esistenti controlli di privacy. -Usa la necessaria discrezione. -

-
diff --git a/view/sv/insecure_net.tpl b/view/sv/insecure_net.tpl deleted file mode 100644 index 5628639ccf..0000000000 --- a/view/sv/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

-The social network that $name belongs to is an open network with limited or non-existent privacy controls. -Please use appropriate discretion. -

-
\ No newline at end of file diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index e4fa1f9d7e..0c3cade9e5 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1434,7 +1434,7 @@ input#dfrn-url { /*margin-left: 50px;*/ } -#block-message, #ignore-message, #profile-edit-insecure { +#block-message, #ignore-message { margin-top: 20px; color: #FF0000; font-size: 1.1em; @@ -1443,13 +1443,21 @@ input#dfrn-url { padding: 10px; } +#profile-edit-insecure { + margin-top: 20px; + color: #FF0000; + font-size: 1.1em; + border: 1px solid #FF8888; + background-color: #FFEEEE; + padding-left: 5px; + /*: 3px 3px 3px 5px; */ + width: 587px; +} + #block-message, #ignore-message { width: 180px; } -#profile-edit-insecure { - width: 600px; -} /* .profile-tabs {