aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
commitbc69a957dc875b699240827cb4af2691f8a8fcd6 (patch)
tree28442b76b1c8fec40235445d62b01c182f770b5f /view
parent43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (diff)
parentecabe1d505464577fdc3d3ff0090371c8ca0cf1e (diff)
downloadvolse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.gz
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.bz2
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: ignore removed plugins fix messed up config tables w/ duplicate entries small fixes for the German strings fix bad sql update revert config changes, we're getting duplicate keys new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... * master:
Diffstat (limited to 'view')
-rw-r--r--view/de/messages.po32
-rw-r--r--view/de/strings.php6
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/communityhome.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/contact_template.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/directory_item.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/fpostit/fpostit.js0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/group_side.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/attach.pngbin1069 -> 1069 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/audio.pngbin762 -> 762 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/camera.pngbin685 -> 685 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/close_box.pngbin206 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/drop.pngbin292 -> 292 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/file_as.pngbin352 -> 352 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/link.pngbin365 -> 365 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/lock.pngbin366 -> 366 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/lupe.pngbin697 -> 697 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/messages.pngbin579 -> 579 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/messages2.pngbin579 -> 579 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/next.pngbin300 -> 300 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/notifications.pngbin754 -> 754 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/notify.pngbin795 -> 795 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/notify2.pngbin795 -> 795 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/pencil.pngbin286 -> 286 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/photo-menu.jpgbin459 -> 459 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/prev.pngbin336 -> 336 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/recycle.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/remote.pngbin427 -> 427 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/scroll_top.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/selected.pngbin211 -> 211 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/star.pngbin388 -> 388 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/starred.pngbin501 -> 501 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/tagged.pngbin353 -> 353 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/unlock.pngbin362 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/unstarred.pngbin468 -> 468 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/video.pngbin472 -> 472 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/icons/weblink.pngbin505 -> 505 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/jot.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/mail_conv.tpl0
-rw-r--r--view/theme/diabook-aerith/nav.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/photo_view.tpl0
-rw-r--r--view/theme/diabook-aerith/profile_vcard.tpl2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/rs_common_tabs.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/search_item.tpl0
-rw-r--r--view/theme/diabook-aerith/style-network.css7
-rw-r--r--view/theme/diabook-aerith/style-profile.css6
-rw-r--r--view/theme/diabook-aerith/style.css24
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/theme.php2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/communityhome.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/contact_template.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/directory_item.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/fpostit/fpostit.js0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/group_side.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/attach.pngbin1069 -> 1069 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/audio.pngbin762 -> 762 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/camera.pngbin685 -> 685 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/close_box.pngbin206 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/contacts2.pngbin549 -> 549 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/drop.pngbin292 -> 292 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/file_as.pngbin352 -> 352 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/link.pngbin365 -> 365 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/lock.pngbin366 -> 366 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/lupe.pngbin697 -> 697 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/messages.pngbin490 -> 490 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/next.pngbin300 -> 300 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/notifications.pngbin727 -> 727 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/notify.pngbin608 -> 608 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/pencil.pngbin286 -> 286 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/prev.pngbin336 -> 336 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/recycle.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/remote.pngbin427 -> 427 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/scroll_top.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/selected.pngbin211 -> 211 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/star.pngbin388 -> 388 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/starred.pngbin501 -> 501 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/tagged.pngbin353 -> 353 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/unlock.pngbin362 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/unstarred.pngbin468 -> 468 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/video.pngbin472 -> 472 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/icons/weblink.pngbin505 -> 505 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/jot.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/mail_conv.tpl0
-rw-r--r--view/theme/diabook-blue/nav.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/photo_view.tpl0
-rw-r--r--view/theme/diabook-blue/profile_vcard.tpl2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/rs_common_tabs.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/search_item.tpl0
-rw-r--r--view/theme/diabook-blue/style-network.css7
-rw-r--r--view/theme/diabook-blue/style-profile.css6
-rw-r--r--view/theme/diabook-blue/style.css24
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/theme.php2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/communityhome.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/contact_template.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/directory_item.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/fpostit/fpostit.js0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/group_side.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/attach.pngbin1069 -> 1069 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/audio.pngbin762 -> 762 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/camera.pngbin685 -> 685 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/close_box.pngbin206 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/contacts.pngbin588 -> 588 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/contacts2.pngbin549 -> 549 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/drop.pngbin292 -> 292 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/file_as.pngbin352 -> 352 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/link.pngbin365 -> 365 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/lock.pngbin366 -> 366 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/lupe.pngbin697 -> 697 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/next.pngbin300 -> 300 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/notifications.pngbin708 -> 708 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/pencil.pngbin286 -> 286 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/photo-menu.jpgbin459 -> 459 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/prev.pngbin336 -> 336 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/recycle.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/remote.pngbin427 -> 427 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/scroll_top.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/selected.pngbin211 -> 211 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/star.pngbin388 -> 388 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/starred.pngbin501 -> 501 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/tagged.pngbin353 -> 353 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/unlock.pngbin362 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/unstarred.pngbin468 -> 468 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/video.pngbin472 -> 472 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/icons/weblink.pngbin505 -> 505 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/jot.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/mail_conv.tpl0
-rw-r--r--view/theme/diabook-red/nav.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/photo_view.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/rs_common_tabs.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/search_item.tpl0
-rw-r--r--view/theme/diabook-red/style-network.css8
-rw-r--r--view/theme/diabook-red/style-profile.css6
-rw-r--r--view/theme/diabook-red/style.css24
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/theme.php2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/communityhome.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/contact_template.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/directory_item.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/fpostit/fpostit.js0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/group_side.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/attach.pngbin1069 -> 1069 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/audio.pngbin762 -> 762 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/camera.pngbin685 -> 685 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/close_box.pngbin206 -> 206 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/contacts2.pngbin549 -> 549 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/drop.pngbin292 -> 292 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/expand.pngbin263 -> 263 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/file_as.pngbin352 -> 352 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/link.pngbin365 -> 365 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/lock.pngbin366 -> 366 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/lupe.pngbin697 -> 697 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/messages.pngbin488 -> 488 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/next.pngbin300 -> 300 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/notifications.pngbin714 -> 714 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/notify.pngbin534 -> 534 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/pencil.pngbin286 -> 286 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/prev.pngbin336 -> 336 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/recycle.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/remote.pngbin427 -> 427 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/scroll_top.pngbin296 -> 296 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/selected.pngbin211 -> 211 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/star.pngbin388 -> 388 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/starred.pngbin501 -> 501 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/tagged.pngbin353 -> 353 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/unlock.pngbin362 -> 362 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/unstarred.pngbin468 -> 468 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/video.pngbin472 -> 472 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/icons/weblink.pngbin505 -> 505 bytes
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/jot.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/mail_conv.tpl0
-rw-r--r--view/theme/diabook/nav.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/photo_view.tpl0
-rw-r--r--view/theme/diabook/profile_vcard.tpl2
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/rs_common_tabs.tpl0
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/search_item.tpl0
-rw-r--r--view/theme/diabook/style-profile.css2
-rw-r--r--view/theme/diabook/style.css20
-rwxr-xr-x[-rw-r--r--]view/theme/diabook/theme.php15
175 files changed, 145 insertions, 70 deletions
diff --git a/view/de/messages.po b/view/de/messages.po
index 0e4cb2ea7..1036e7b75 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-04-04 15:51-0700\n"
-"PO-Revision-Date: 2012-04-06 07:35+0000\n"
+"POT-Creation-Date: 2012-04-05 10:00-0700\n"
+"PO-Revision-Date: 2012-04-06 10:40+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgstr "wurde getaggt in einem"
#: ../../view/theme/diabook-blue/theme.php:82
#: ../../view/theme/diabook/theme.php:86
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
-#: ../../include/diaspora.php:1650 ../../include/conversation.php:53
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
msgstr "Foto"
@@ -1021,8 +1021,8 @@ msgid "This is required for message delivery to work."
msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
#: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
-msgstr "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
#: ../../mod/install.php:364
msgid ""
@@ -2232,7 +2232,7 @@ msgstr "Markierte"
#: ../../mod/network.php:197
msgid "Shared Links"
-msgstr "Geteilte Internetlinks"
+msgstr "Geteilte Links"
#: ../../mod/network.php:270
#, php-format
@@ -2274,7 +2274,7 @@ msgstr "Ungültiger Kontakt."
msgid "Personal Notes"
msgstr "Persönliche Notizen"
-#: ../../mod/notes.php:63 ../../mod/filer.php:29
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
msgid "Save"
msgstr "Speichern"
@@ -2713,7 +2713,7 @@ msgstr "Personen Suche"
#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
#: ../../view/theme/diabook-aerith/theme.php:77
#: ../../view/theme/diabook-aerith/theme.php:86
-#: ../../include/diaspora.php:1650 ../../include/conversation.php:48
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130
msgid "status"
@@ -2725,7 +2725,7 @@ msgstr "Status"
#: ../../view/theme/diabook-blue/theme.php:91
#: ../../view/theme/diabook/theme.php:95
#: ../../view/theme/diabook-aerith/theme.php:91
-#: ../../include/diaspora.php:1666 ../../include/conversation.php:65
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s mag %2$ss %3$s"
@@ -3798,11 +3798,11 @@ msgstr "sichtbar für jeden"
msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten"
-#: ../../mod/filer.php:28 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:918
msgid "Save to Folder:"
msgstr "In diesen Ordner verschieben:"
-#: ../../mod/filer.php:28
+#: ../../mod/filer.php:29
msgid "- select -"
msgstr "- auswählen -"
@@ -4006,7 +4006,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
msgid "Unable to set contact photo."
msgstr "Konnte das Bild des Kontakts nicht speichern."
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
#: ../../include/conversation.php:101
#, php-format
msgid "%1$s is now friends with %2$s"
@@ -5216,7 +5216,7 @@ msgstr "Hilfe oder @NewHere"
#: ../../view/theme/diabook/theme.php:206
#: ../../view/theme/diabook-aerith/theme.php:201
msgid "Connect Services"
-msgstr "Mit anderen Webanwendungen verbinden"
+msgstr "Verbinde Dienste"
#: ../../view/theme/diabook-red/theme.php:207
#: ../../view/theme/diabook-blue/theme.php:207
@@ -5850,15 +5850,15 @@ msgstr "Beitrag"
msgid "Item filed"
msgstr "Beitrag abgelegt"
-#: ../../include/diaspora.php:578
+#: ../../include/diaspora.php:582
msgid "Sharing notification from Diaspora network"
msgstr "Freigabe-Benachrichtigung von Diaspora"
-#: ../../include/diaspora.php:1965
+#: ../../include/diaspora.php:1969
msgid "Attachments:"
msgstr "Anhänge:"
-#: ../../include/diaspora.php:2148
+#: ../../include/diaspora.php:2152
#, php-format
msgid "[Relayed] Comment authored by %s from network %s"
msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
diff --git a/view/de/strings.php b/view/de/strings.php
index 811fb98d0..28567396b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -212,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@@ -491,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
$a->strings["Posted Order"] = "Neueste Beiträge";
$a->strings["New"] = "Neue";
$a->strings["Starred"] = "Markierte";
-$a->strings["Shared Links"] = "Geteilte Internetlinks";
+$a->strings["Shared Links"] = "Geteilte Links";
$a->strings["Warning: This group contains %s member from an insecure network."] = array(
0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@@ -1158,7 +1158,7 @@ $a->strings["Similar Interests"] = "Ähnliche Interessen";
$a->strings["Invite Friends"] = "Freunde einladen";
$a->strings["Community Pages"] = "Foren";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
-$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden";
+$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 4873cdd14..4873cdd14 100644..100755
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook-aerith/contact_template.tpl
+++ b/view/theme/diabook-aerith/contact_template.tpl
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook-aerith/icons/attach.png
+++ b/view/theme/diabook-aerith/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook-aerith/icons/audio.png
+++ b/view/theme/diabook-aerith/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook-aerith/icons/camera.png
+++ b/view/theme/diabook-aerith/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook-aerith/icons/close_box.png
+++ b/view/theme/diabook-aerith/icons/close_box.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook-aerith/icons/drop.png
+++ b/view/theme/diabook-aerith/icons/drop.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook-aerith/icons/file_as.png
+++ b/view/theme/diabook-aerith/icons/file_as.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook-aerith/icons/link.png
+++ b/view/theme/diabook-aerith/icons/link.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook-aerith/icons/lock.png
+++ b/view/theme/diabook-aerith/icons/lock.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook-aerith/icons/lupe.png
+++ b/view/theme/diabook-aerith/icons/lupe.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d..e2bf7d24d 100644..100755
--- a/view/theme/diabook-aerith/icons/messages.png
+++ b/view/theme/diabook-aerith/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
index e2bf7d24d..e2bf7d24d 100644..100755
--- a/view/theme/diabook-aerith/icons/messages2.png
+++ b/view/theme/diabook-aerith/icons/messages2.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook-aerith/icons/next.png
+++ b/view/theme/diabook-aerith/icons/next.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818..2b4fbb818 100644..100755
--- a/view/theme/diabook-aerith/icons/notifications.png
+++ b/view/theme/diabook-aerith/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53..9765bfd53 100644..100755
--- a/view/theme/diabook-aerith/icons/notify.png
+++ b/view/theme/diabook-aerith/icons/notify.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
index 9765bfd53..9765bfd53 100644..100755
--- a/view/theme/diabook-aerith/icons/notify2.png
+++ b/view/theme/diabook-aerith/icons/notify2.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook-aerith/icons/pencil.png
+++ b/view/theme/diabook-aerith/icons/pencil.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100644..100755
--- a/view/theme/diabook-aerith/icons/photo-menu.jpg
+++ b/view/theme/diabook-aerith/icons/photo-menu.jpg
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook-aerith/icons/prev.png
+++ b/view/theme/diabook-aerith/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook-aerith/icons/recycle.png
+++ b/view/theme/diabook-aerith/icons/recycle.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook-aerith/icons/remote.png
+++ b/view/theme/diabook-aerith/icons/remote.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook-aerith/icons/scroll_top.png
+++ b/view/theme/diabook-aerith/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook-aerith/icons/selected.png
+++ b/view/theme/diabook-aerith/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook-aerith/icons/star.png
+++ b/view/theme/diabook-aerith/icons/star.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook-aerith/icons/starred.png
+++ b/view/theme/diabook-aerith/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook-aerith/icons/tagged.png
+++ b/view/theme/diabook-aerith/icons/tagged.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook-aerith/icons/unlock.png
+++ b/view/theme/diabook-aerith/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook-aerith/icons/unstarred.png
+++ b/view/theme/diabook-aerith/icons/unstarred.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook-aerith/icons/video.png
+++ b/view/theme/diabook-aerith/icons/video.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook-aerith/icons/weblink.png
+++ b/view/theme/diabook-aerith/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index ee30da7bf..ee30da7bf 100644..100755
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ b/view/theme/diabook-aerith/mail_conv.tpl
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index f84b902d5..6fab83afc 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ b/view/theme/diabook-aerith/photo_view.tpl
diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index e28ec2909..6fcffcc9b 100644
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -22,7 +22,7 @@
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook-aerith/search_item.tpl
+++ b/view/theme/diabook-aerith/search_item.tpl
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 6e3b3f822..9925a90aa 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -2093,9 +2093,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index f41c4a98a..19fea9a83 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -2082,10 +2082,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 3d53115df..f7bdaeef6 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -2111,10 +2129,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e56f0ab74..b48f061fd 100644..100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,7 +3,7 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
* Author:
*/
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 6e126827b..6e126827b 100644..100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook-blue/contact_template.tpl
+++ b/view/theme/diabook-blue/contact_template.tpl
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook-blue/directory_item.tpl
+++ b/view/theme/diabook-blue/directory_item.tpl
diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ b/view/theme/diabook-blue/fpostit/fpostit.js
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook-blue/icons/attach.png
+++ b/view/theme/diabook-blue/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook-blue/icons/audio.png
+++ b/view/theme/diabook-blue/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook-blue/icons/camera.png
+++ b/view/theme/diabook-blue/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook-blue/icons/close_box.png
+++ b/view/theme/diabook-blue/icons/close_box.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png
index 7817279f4..7817279f4 100644..100755
--- a/view/theme/diabook-blue/icons/contacts2.png
+++ b/view/theme/diabook-blue/icons/contacts2.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook-blue/icons/drop.png
+++ b/view/theme/diabook-blue/icons/drop.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook-blue/icons/file_as.png
+++ b/view/theme/diabook-blue/icons/file_as.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook-blue/icons/link.png
+++ b/view/theme/diabook-blue/icons/link.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook-blue/icons/lock.png
+++ b/view/theme/diabook-blue/icons/lock.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook-blue/icons/lupe.png
+++ b/view/theme/diabook-blue/icons/lupe.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png
index f7010c98c..f7010c98c 100644..100755
--- a/view/theme/diabook-blue/icons/messages.png
+++ b/view/theme/diabook-blue/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook-blue/icons/next.png
+++ b/view/theme/diabook-blue/icons/next.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index c23673dbd..c23673dbd 100644..100755
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook-blue/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png
index 8a7bdc38f..8a7bdc38f 100644..100755
--- a/view/theme/diabook-blue/icons/notify.png
+++ b/view/theme/diabook-blue/icons/notify.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook-blue/icons/pencil.png
+++ b/view/theme/diabook-blue/icons/pencil.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook-blue/icons/prev.png
+++ b/view/theme/diabook-blue/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook-blue/icons/recycle.png
+++ b/view/theme/diabook-blue/icons/recycle.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook-blue/icons/remote.png
+++ b/view/theme/diabook-blue/icons/remote.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook-blue/icons/scroll_top.png
+++ b/view/theme/diabook-blue/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook-blue/icons/selected.png
+++ b/view/theme/diabook-blue/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook-blue/icons/star.png
+++ b/view/theme/diabook-blue/icons/star.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook-blue/icons/starred.png
+++ b/view/theme/diabook-blue/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook-blue/icons/tagged.png
+++ b/view/theme/diabook-blue/icons/tagged.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook-blue/icons/unlock.png
+++ b/view/theme/diabook-blue/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook-blue/icons/unstarred.png
+++ b/view/theme/diabook-blue/icons/unstarred.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook-blue/icons/video.png
+++ b/view/theme/diabook-blue/icons/video.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook-blue/icons/weblink.png
+++ b/view/theme/diabook-blue/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
index bd43994b5..bd43994b5 100644..100755
--- a/view/theme/diabook-blue/jot.tpl
+++ b/view/theme/diabook-blue/jot.tpl
diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook-blue/mail_conv.tpl
+++ b/view/theme/diabook-blue/mail_conv.tpl
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 3b78b5995..fd29d9309 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 20926656a..20926656a 100644..100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index e28ec2909..6fcffcc9b 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -22,7 +22,7 @@
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook-blue/rs_common_tabs.tpl
+++ b/view/theme/diabook-blue/rs_common_tabs.tpl
diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook-blue/search_item.tpl
+++ b/view/theme/diabook-blue/search_item.tpl
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 991b19849..48096f752 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -2054,9 +2054,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index fca29d088..2c1fb0512 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -2049,10 +2049,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 8a05fc4c4..83fd0c47f 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -2067,10 +2085,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2e7aca92a..c64e9cd37 100644..100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,7 +3,7 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
* Author:
*/
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index c47bfbda5..c47bfbda5 100644..100755
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook-red/contact_template.tpl
+++ b/view/theme/diabook-red/contact_template.tpl
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook-red/directory_item.tpl
+++ b/view/theme/diabook-red/directory_item.tpl
diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ b/view/theme/diabook-red/fpostit/fpostit.js
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook-red/group_side.tpl
+++ b/view/theme/diabook-red/group_side.tpl
diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook-red/icons/attach.png
+++ b/view/theme/diabook-red/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook-red/icons/audio.png
+++ b/view/theme/diabook-red/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook-red/icons/camera.png
+++ b/view/theme/diabook-red/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook-red/icons/close_box.png
+++ b/view/theme/diabook-red/icons/close_box.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png
index 20c990c84..20c990c84 100644..100755
--- a/view/theme/diabook-red/icons/contacts.png
+++ b/view/theme/diabook-red/icons/contacts.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png
index 7817279f4..7817279f4 100644..100755
--- a/view/theme/diabook-red/icons/contacts2.png
+++ b/view/theme/diabook-red/icons/contacts2.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook-red/icons/drop.png
+++ b/view/theme/diabook-red/icons/drop.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook-red/icons/file_as.png
+++ b/view/theme/diabook-red/icons/file_as.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook-red/icons/link.png
+++ b/view/theme/diabook-red/icons/link.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook-red/icons/lock.png
+++ b/view/theme/diabook-red/icons/lock.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook-red/icons/lupe.png
+++ b/view/theme/diabook-red/icons/lupe.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook-red/icons/next.png
+++ b/view/theme/diabook-red/icons/next.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png
index 97e5c311c..97e5c311c 100644..100755
--- a/view/theme/diabook-red/icons/notifications.png
+++ b/view/theme/diabook-red/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook-red/icons/pencil.png
+++ b/view/theme/diabook-red/icons/pencil.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100644..100755
--- a/view/theme/diabook-red/icons/photo-menu.jpg
+++ b/view/theme/diabook-red/icons/photo-menu.jpg
Binary files differ
diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook-red/icons/prev.png
+++ b/view/theme/diabook-red/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook-red/icons/recycle.png
+++ b/view/theme/diabook-red/icons/recycle.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook-red/icons/remote.png
+++ b/view/theme/diabook-red/icons/remote.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook-red/icons/scroll_top.png
+++ b/view/theme/diabook-red/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook-red/icons/selected.png
+++ b/view/theme/diabook-red/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook-red/icons/star.png
+++ b/view/theme/diabook-red/icons/star.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook-red/icons/starred.png
+++ b/view/theme/diabook-red/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook-red/icons/tagged.png
+++ b/view/theme/diabook-red/icons/tagged.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook-red/icons/unlock.png
+++ b/view/theme/diabook-red/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook-red/icons/unstarred.png
+++ b/view/theme/diabook-red/icons/unstarred.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook-red/icons/video.png
+++ b/view/theme/diabook-red/icons/video.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook-red/icons/weblink.png
+++ b/view/theme/diabook-red/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
index bd43994b5..bd43994b5 100644..100755
--- a/view/theme/diabook-red/jot.tpl
+++ b/view/theme/diabook-red/jot.tpl
diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook-red/mail_conv.tpl
+++ b/view/theme/diabook-red/mail_conv.tpl
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index fdf748cb2..dc3fd0cde 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook-red/photo_view.tpl
+++ b/view/theme/diabook-red/photo_view.tpl
diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook-red/rs_common_tabs.tpl
+++ b/view/theme/diabook-red/rs_common_tabs.tpl
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook-red/search_item.tpl
+++ b/view/theme/diabook-red/search_item.tpl
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 863ad87ad..5cec59c87 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6
background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
background-image: -webkit-gradient(
linear,
@@ -2090,9 +2091,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index dcd0092c9..2568e93d7 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -2063,10 +2063,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index b1061f035..5475537bb 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -2097,10 +2115,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 0db9818e4..a0d5ead73 100644..100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,7 +3,7 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
* Author:
*/
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5c2164b50..5c2164b50 100644..100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook/fpostit/fpostit.js
+++ b/view/theme/diabook/fpostit/fpostit.js
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook/icons/attach.png
+++ b/view/theme/diabook/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook/icons/audio.png
+++ b/view/theme/diabook/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook/icons/camera.png
+++ b/view/theme/diabook/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook/icons/close_box.png
+++ b/view/theme/diabook/icons/close_box.png
Binary files differ
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
index 7817279f4..7817279f4 100644..100755
--- a/view/theme/diabook/icons/contacts2.png
+++ b/view/theme/diabook/icons/contacts2.png
Binary files differ
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook/icons/drop.png
+++ b/view/theme/diabook/icons/drop.png
Binary files differ
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
index a46e88ea5..a46e88ea5 100644..100755
--- a/view/theme/diabook/icons/expand.png
+++ b/view/theme/diabook/icons/expand.png
Binary files differ
diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook/icons/file_as.png
+++ b/view/theme/diabook/icons/file_as.png
Binary files differ
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook/icons/link.png
+++ b/view/theme/diabook/icons/link.png
Binary files differ
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook/icons/lock.png
+++ b/view/theme/diabook/icons/lock.png
Binary files differ
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook/icons/lupe.png
+++ b/view/theme/diabook/icons/lupe.png
Binary files differ
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index 38e11ef88..38e11ef88 100644..100755
--- a/view/theme/diabook/icons/messages.png
+++ b/view/theme/diabook/icons/messages.png
Binary files differ
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook/icons/next.png
+++ b/view/theme/diabook/icons/next.png
Binary files differ
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..270997740 100644..100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..9b852d05b 100644..100755
--- a/view/theme/diabook/icons/notify.png
+++ b/view/theme/diabook/icons/notify.png
Binary files differ
diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook/icons/pencil.png
+++ b/view/theme/diabook/icons/pencil.png
Binary files differ
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook/icons/prev.png
+++ b/view/theme/diabook/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook/icons/recycle.png
+++ b/view/theme/diabook/icons/recycle.png
Binary files differ
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook/icons/remote.png
+++ b/view/theme/diabook/icons/remote.png
Binary files differ
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook/icons/scroll_top.png
+++ b/view/theme/diabook/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook/icons/selected.png
+++ b/view/theme/diabook/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
Binary files differ
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook/icons/starred.png
+++ b/view/theme/diabook/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook/icons/tagged.png
+++ b/view/theme/diabook/icons/tagged.png
Binary files differ
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook/icons/unlock.png
+++ b/view/theme/diabook/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook/icons/unstarred.png
+++ b/view/theme/diabook/icons/unstarred.png
Binary files differ
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook/icons/video.png
+++ b/view/theme/diabook/icons/video.png
Binary files differ
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook/icons/weblink.png
+++ b/view/theme/diabook/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index bd43994b5..bd43994b5 100644..100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook/mail_conv.tpl
+++ b/view/theme/diabook/mail_conv.tpl
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 78eb34197..522fb22b4 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -36,7 +36,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index e28ec2909..b982a2069 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -22,7 +22,7 @@
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ b/view/theme/diabook/rs_common_tabs.tpl
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 5ac152252..5edfc73a3 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2023,6 +2023,8 @@ ul.tabs li .active {
/* photo */
.photo {
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 5f60c0bff..90291d7b6 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -449,6 +449,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -2046,6 +2064,8 @@ height: 350px;
/* photo */
.photo {
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 50a7c6974..0c83a0567 100644..100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
* Author:
*/
@@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+
//js scripts
$a->page['htmlhead'] .= '
@@ -350,15 +351,9 @@ $a->page['htmlhead'] .= '
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
-
- $(document).ready(function (){
- $("iframe").each(function(){
- var url = $(this).attr("src");
- $(this).attr("src",url+"?wmode=transparent"); });
- });
-
+
</script>';
-
+
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '