diff --git a/js/main.js b/js/main.js old mode 100644 new mode 100755 index 744691b6d..7f0428b5b --- a/js/main.js +++ b/js/main.js @@ -119,9 +119,7 @@ var home = $(data).find('home').text(); if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - - - + var intro = $(data).find('intro').text(); if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } $('#intro-update').html(intro); @@ -129,6 +127,14 @@ var mail = $(data).find('mail').text(); if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } $('#mail-update').html(mail); + + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') notif = eNotif.attr('count'); 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 \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 old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl old mode 100644 new mode 100755 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 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl old mode 100644 new mode 100755 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 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index e56f0ab74..b48f061fd --- 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 old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl old mode 100644 new mode 100755 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 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl old mode 100644 new mode 100755 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 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 2e7aca92a..c64e9cd37 --- 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 old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl old mode 100644 new mode 100755 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 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 0db9818e4..a0d5ead73 --- 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 old mode 100644 new mode 100755 diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl old mode 100644 new mode 100755 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 @@ $nav.contacts.1 @@ -36,7 +36,7 @@ diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl old mode 100644 new mode 100755 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 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 index 50a7c6974..0c83a0567 --- 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('', $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('', $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"); }); - }); - + '; - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= '