From 0d60dbef31ea645b8495d8e28fca6c248d20048b Mon Sep 17 00:00:00 2001 From: Alexander Kampmann Date: Mon, 9 Apr 2012 00:45:10 +0200 Subject: added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email --- view/de/strings.php | 1 + view/de/update_fail_eml.tpl | 12 ++++++++++++ view/update_fail_eml.tpl | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 view/de/update_fail_eml.tpl create mode 100644 view/update_fail_eml.tpl (limited to 'view') diff --git a/view/de/strings.php b/view/de/strings.php index 28567396b..5339d8a12 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1511,3 +1511,4 @@ $a->strings["[today]"] = "[heute]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; $a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s'; diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl new file mode 100644 index 000000000..26be1786f --- /dev/null +++ b/view/de/update_fail_eml.tpl @@ -0,0 +1,12 @@ +Hey, +Ich bin's, $sitename. +Die Friendica-Entwickler haben gerade Update $update freigegeben, +aber als ich es installieren wollte, ist irgendetwas schief gegangen. +Das sollte schnell repariert werden und alleine schaffe ich es nicht. +Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst. +Meine Datenbank könnte ziemlich durcheinander sein. + +Die Fehlermeldung ist '$error'. + +Tut mir leid, +dein Friendica Server unter $siteurl \ No newline at end of file diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl new file mode 100644 index 000000000..f68a3dece --- /dev/null +++ b/view/update_fail_eml.tpl @@ -0,0 +1,11 @@ +Hey, +I'm $sitename. +The friendica developers released update $update recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and I can't do it alone. Please contact a +friendica developer if you can not help me on your own. My database might be invalid. + +The error message is '$error'. + +I'm sorry, +your friendica server at $siteurl \ No newline at end of file -- cgit v1.2.3 From 7187516718639fe93a9fb8fa78960bce85c7eaca Mon Sep 17 00:00:00 2001 From: Alexander Kampmann Date: Mon, 9 Apr 2012 14:27:52 +0200 Subject: fixed some typos --- view/de/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/de/strings.php b/view/de/strings.php index 5339d8a12..59c939ca0 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -777,7 +777,7 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; -$a->strings["Login failed."] = "Annmeldung fehlgeschlagen."; +$a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; $a->strings["Connect URL missing."] = "Connect-URL fehlt"; $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -- cgit v1.2.3 From c27c340de186631858763e630166d6fa24543e2f Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 9 Apr 2012 16:41:23 +0200 Subject: diabook-nav-icons with gradient --- view/theme/diabook/icons/contacts.png | Bin 559 -> 735 bytes view/theme/diabook/icons/contacts3.png | Bin 0 -> 559 bytes view/theme/diabook/icons/messages.png | Bin 488 -> 773 bytes view/theme/diabook/icons/messages3.png | Bin 0 -> 488 bytes view/theme/diabook/icons/notifications.png | Bin 714 -> 1072 bytes view/theme/diabook/icons/notifications3.png | Bin 0 -> 714 bytes view/theme/diabook/icons/notify.png | Bin 534 -> 931 bytes view/theme/diabook/icons/notify3.png | Bin 0 -> 534 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 view/theme/diabook/icons/contacts3.png mode change 100755 => 100644 view/theme/diabook/icons/messages.png create mode 100644 view/theme/diabook/icons/messages3.png create mode 100755 view/theme/diabook/icons/notifications3.png create mode 100755 view/theme/diabook/icons/notify3.png (limited to 'view') diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png index 8a3e69ec1..f1c3649ef 100644 Binary files a/view/theme/diabook/icons/contacts.png and b/view/theme/diabook/icons/contacts.png differ diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png new file mode 100644 index 000000000..8a3e69ec1 Binary files /dev/null and b/view/theme/diabook/icons/contacts3.png differ diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png old mode 100755 new mode 100644 index 38e11ef88..fb77caf0e Binary files a/view/theme/diabook/icons/messages.png and b/view/theme/diabook/icons/messages.png differ diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png new file mode 100644 index 000000000..838231fce Binary files /dev/null and b/view/theme/diabook/icons/messages3.png differ diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png index 270997740..f35c621df 100755 Binary files a/view/theme/diabook/icons/notifications.png and b/view/theme/diabook/icons/notifications.png differ diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png new file mode 100755 index 000000000..270997740 Binary files /dev/null and b/view/theme/diabook/icons/notifications3.png differ diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png index 9b852d05b..cf94ea7c5 100755 Binary files a/view/theme/diabook/icons/notify.png and b/view/theme/diabook/icons/notify.png differ diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png new file mode 100755 index 000000000..9b852d05b Binary files /dev/null and b/view/theme/diabook/icons/notify3.png differ -- cgit v1.2.3 From d25a9df99600b0ce204d88114f07f5ed1db9d5d3 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 9 Apr 2012 19:56:53 +0200 Subject: diabook-themes: small icon fix --- view/theme/diabook-aerith/icons/contacts.png | Bin 568 -> 803 bytes view/theme/diabook-aerith/icons/contacts3.png | Bin 0 -> 568 bytes view/theme/diabook-aerith/icons/messages.png | Bin 579 -> 901 bytes view/theme/diabook-aerith/icons/messages3.png | Bin 0 -> 579 bytes view/theme/diabook-aerith/icons/notifications.png | Bin 754 -> 1033 bytes view/theme/diabook-aerith/icons/notifications3.png | Bin 0 -> 754 bytes view/theme/diabook-aerith/icons/notify.png | Bin 795 -> 1100 bytes view/theme/diabook-aerith/icons/notify3.png | Bin 0 -> 795 bytes view/theme/diabook/icons/contacts.png | Bin 735 -> 773 bytes view/theme/diabook/icons/messages.png | Bin 773 -> 777 bytes view/theme/diabook/icons/messages3.png | Bin 488 -> 488 bytes view/theme/diabook/icons/notifications.png | Bin 1072 -> 926 bytes view/theme/diabook/icons/notifications3.png | Bin 714 -> 714 bytes view/theme/diabook/icons/notify.png | Bin 931 -> 1001 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 view/theme/diabook-aerith/icons/contacts3.png create mode 100755 view/theme/diabook-aerith/icons/messages3.png create mode 100755 view/theme/diabook-aerith/icons/notifications3.png create mode 100755 view/theme/diabook-aerith/icons/notify3.png (limited to 'view') diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png index cd0e289a7..79f6d497c 100644 Binary files a/view/theme/diabook-aerith/icons/contacts.png and b/view/theme/diabook-aerith/icons/contacts.png differ diff --git a/view/theme/diabook-aerith/icons/contacts3.png b/view/theme/diabook-aerith/icons/contacts3.png new file mode 100644 index 000000000..cd0e289a7 Binary files /dev/null and b/view/theme/diabook-aerith/icons/contacts3.png differ diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png index e2bf7d24d..c83ba186a 100755 Binary files a/view/theme/diabook-aerith/icons/messages.png and b/view/theme/diabook-aerith/icons/messages.png differ diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png new file mode 100755 index 000000000..e2bf7d24d Binary files /dev/null and b/view/theme/diabook-aerith/icons/messages3.png differ diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png index 2b4fbb818..2bcd74927 100755 Binary files a/view/theme/diabook-aerith/icons/notifications.png and b/view/theme/diabook-aerith/icons/notifications.png differ diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png new file mode 100755 index 000000000..2b4fbb818 Binary files /dev/null and b/view/theme/diabook-aerith/icons/notifications3.png differ diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png index 9765bfd53..159cd2c59 100755 Binary files a/view/theme/diabook-aerith/icons/notify.png and b/view/theme/diabook-aerith/icons/notify.png differ diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png new file mode 100755 index 000000000..9765bfd53 Binary files /dev/null and b/view/theme/diabook-aerith/icons/notify3.png differ diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png index f1c3649ef..1fb6d695b 100644 Binary files a/view/theme/diabook/icons/contacts.png and b/view/theme/diabook/icons/contacts.png differ diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png index fb77caf0e..ab7b0f491 100644 Binary files a/view/theme/diabook/icons/messages.png and b/view/theme/diabook/icons/messages.png differ diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png index 838231fce..4f3ce3693 100644 Binary files a/view/theme/diabook/icons/messages3.png and b/view/theme/diabook/icons/messages3.png differ diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png index f35c621df..347f1519e 100755 Binary files a/view/theme/diabook/icons/notifications.png and b/view/theme/diabook/icons/notifications.png differ diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png index 270997740..2c9c791c0 100755 Binary files a/view/theme/diabook/icons/notifications3.png and b/view/theme/diabook/icons/notifications3.png differ diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png index cf94ea7c5..355abb1eb 100755 Binary files a/view/theme/diabook/icons/notify.png and b/view/theme/diabook/icons/notify.png differ -- cgit v1.2.3 From 1f9fe8b5eeebfb6bc1275cba7dbb4daac1a2e910 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 8 Apr 2012 23:20:31 +0200 Subject: Remove Gravatar from core and add new hook avatar_lookup. This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow? --- view/admin_site.tpl | 1 - 1 file changed, 1 deletion(-) (limited to 'view') diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 01fe893c6..ec144fbba 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -17,7 +17,6 @@ {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$no_gravatar }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-- cgit v1.2.3 From 0d4fab4ee3cba6db669d6b7e608bfbbba8e8d3dc Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 10 Apr 2012 00:55:39 +0200 Subject: bbcode toolbar attached to the comment text field minor css-fixes --- view/theme/diabook-aerith/comment_item.tpl | 39 ++++++++++++++++++++++++++ view/theme/diabook-aerith/icons/bb-image.png | Bin 0 -> 697 bytes view/theme/diabook-aerith/icons/bb-video.png | Bin 0 -> 917 bytes view/theme/diabook-aerith/icons/bold.png | Bin 0 -> 699 bytes view/theme/diabook-aerith/icons/italic.png | Bin 0 -> 577 bytes view/theme/diabook-aerith/icons/underline.png | Bin 0 -> 604 bytes view/theme/diabook-aerith/style-network.css | 3 +- view/theme/diabook-aerith/style-profile.css | 3 +- view/theme/diabook-aerith/style.css | 25 +++++++++++++++-- view/theme/diabook-aerith/theme.php | 33 ++++++++++++++++++++-- view/theme/diabook-blue/comment_item.tpl | 39 ++++++++++++++++++++++++++ view/theme/diabook-blue/icons/bb-image.png | Bin 0 -> 697 bytes view/theme/diabook-blue/icons/bb-video.png | Bin 0 -> 917 bytes view/theme/diabook-blue/icons/bold.png | Bin 0 -> 699 bytes view/theme/diabook-blue/icons/italic.png | Bin 0 -> 577 bytes view/theme/diabook-blue/icons/underline.png | Bin 0 -> 604 bytes view/theme/diabook-blue/style-network.css | 3 +- view/theme/diabook-blue/style-profile.css | 3 +- view/theme/diabook-blue/style.css | 25 +++++++++++++++-- view/theme/diabook-blue/theme.php | 31 ++++++++++++++++++-- view/theme/diabook-red/comment_item.tpl | 39 ++++++++++++++++++++++++++ view/theme/diabook-red/icons/bb-image.png | Bin 0 -> 697 bytes view/theme/diabook-red/icons/bb-video.png | Bin 0 -> 917 bytes view/theme/diabook-red/icons/bold.png | Bin 0 -> 699 bytes view/theme/diabook-red/icons/italic.png | Bin 0 -> 577 bytes view/theme/diabook-red/icons/underline.png | Bin 0 -> 604 bytes view/theme/diabook-red/style-network.css | 3 +- view/theme/diabook-red/style-profile.css | 3 +- view/theme/diabook-red/style.css | 25 +++++++++++++++-- view/theme/diabook-red/theme.php | 33 ++++++++++++++++++++-- view/theme/diabook/comment_item.tpl | 39 ++++++++++++++++++++++++++ view/theme/diabook/icons/bb-image.png | Bin 0 -> 697 bytes view/theme/diabook/icons/bb-video.png | Bin 0 -> 917 bytes view/theme/diabook/icons/bold.png | Bin 0 -> 699 bytes view/theme/diabook/icons/italic.png | Bin 0 -> 577 bytes view/theme/diabook/icons/underline.png | Bin 0 -> 604 bytes view/theme/diabook/style-network.css | 3 +- view/theme/diabook/style-profile.css | 3 +- view/theme/diabook/style.css | 24 +++++++++++++++- view/theme/diabook/theme.php | 33 ++++++++++++++++++++-- 40 files changed, 383 insertions(+), 26 deletions(-) create mode 100644 view/theme/diabook-aerith/comment_item.tpl create mode 100644 view/theme/diabook-aerith/icons/bb-image.png create mode 100644 view/theme/diabook-aerith/icons/bb-video.png create mode 100644 view/theme/diabook-aerith/icons/bold.png create mode 100644 view/theme/diabook-aerith/icons/italic.png create mode 100644 view/theme/diabook-aerith/icons/underline.png create mode 100644 view/theme/diabook-blue/comment_item.tpl create mode 100644 view/theme/diabook-blue/icons/bb-image.png create mode 100644 view/theme/diabook-blue/icons/bb-video.png create mode 100644 view/theme/diabook-blue/icons/bold.png create mode 100644 view/theme/diabook-blue/icons/italic.png create mode 100644 view/theme/diabook-blue/icons/underline.png create mode 100644 view/theme/diabook-red/comment_item.tpl create mode 100644 view/theme/diabook-red/icons/bb-image.png create mode 100644 view/theme/diabook-red/icons/bb-video.png create mode 100644 view/theme/diabook-red/icons/bold.png create mode 100644 view/theme/diabook-red/icons/italic.png create mode 100644 view/theme/diabook-red/icons/underline.png create mode 100644 view/theme/diabook/comment_item.tpl create mode 100644 view/theme/diabook/icons/bb-image.png create mode 100644 view/theme/diabook/icons/bb-video.png create mode 100644 view/theme/diabook/icons/bold.png create mode 100644 view/theme/diabook/icons/italic.png create mode 100644 view/theme/diabook/icons/underline.png (limited to 'view') diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl new file mode 100644 index 000000000..4668b9ce3 --- /dev/null +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -0,0 +1,39 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + video + img + i + u + b + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/diabook-aerith/icons/bb-image.png b/view/theme/diabook-aerith/icons/bb-image.png new file mode 100644 index 000000000..9a1b32113 Binary files /dev/null and b/view/theme/diabook-aerith/icons/bb-image.png differ diff --git a/view/theme/diabook-aerith/icons/bb-video.png b/view/theme/diabook-aerith/icons/bb-video.png new file mode 100644 index 000000000..bd323531e Binary files /dev/null and b/view/theme/diabook-aerith/icons/bb-video.png differ diff --git a/view/theme/diabook-aerith/icons/bold.png b/view/theme/diabook-aerith/icons/bold.png new file mode 100644 index 000000000..8fab2a10f Binary files /dev/null and b/view/theme/diabook-aerith/icons/bold.png differ diff --git a/view/theme/diabook-aerith/icons/italic.png b/view/theme/diabook-aerith/icons/italic.png new file mode 100644 index 000000000..bf4b2b81d Binary files /dev/null and b/view/theme/diabook-aerith/icons/italic.png differ diff --git a/view/theme/diabook-aerith/icons/underline.png b/view/theme/diabook-aerith/icons/underline.png new file mode 100644 index 000000000..b1b4d3574 Binary files /dev/null and b/view/theme/diabook-aerith/icons/underline.png differ diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 07bda6a24..385b58ac4 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1447,7 +1448,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 8909f0870..078b6d01f 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1439,7 +1440,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 23ae05940..2089090f1 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -82,7 +82,27 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bold{ + background-image: url("../../../view/theme/diabook-aerith/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-aerith/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-aerith/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} .icon.notifications { @@ -1331,6 +1351,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #3465A4; @@ -1592,7 +1613,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 40093e545..1b26e47f8 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,13 +3,13 @@ /* * 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.015) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-aerith (Version: 1.015)"; +$diabook_version = "Diabook-aerith (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); @@ -507,4 +507,31 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -';} \ No newline at end of file +';} + +$a->page['htmlhead'] .= ' + + '; \ No newline at end of file diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl new file mode 100644 index 000000000..4668b9ce3 --- /dev/null +++ b/view/theme/diabook-blue/comment_item.tpl @@ -0,0 +1,39 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + video + img + i + u + b + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/diabook-blue/icons/bb-image.png b/view/theme/diabook-blue/icons/bb-image.png new file mode 100644 index 000000000..9a1b32113 Binary files /dev/null and b/view/theme/diabook-blue/icons/bb-image.png differ diff --git a/view/theme/diabook-blue/icons/bb-video.png b/view/theme/diabook-blue/icons/bb-video.png new file mode 100644 index 000000000..bd323531e Binary files /dev/null and b/view/theme/diabook-blue/icons/bb-video.png differ diff --git a/view/theme/diabook-blue/icons/bold.png b/view/theme/diabook-blue/icons/bold.png new file mode 100644 index 000000000..8fab2a10f Binary files /dev/null and b/view/theme/diabook-blue/icons/bold.png differ diff --git a/view/theme/diabook-blue/icons/italic.png b/view/theme/diabook-blue/icons/italic.png new file mode 100644 index 000000000..bf4b2b81d Binary files /dev/null and b/view/theme/diabook-blue/icons/italic.png differ diff --git a/view/theme/diabook-blue/icons/underline.png b/view/theme/diabook-blue/icons/underline.png new file mode 100644 index 000000000..b1b4d3574 Binary files /dev/null and b/view/theme/diabook-blue/icons/underline.png differ diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 9baa83e8a..b37d82968 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1409,7 +1410,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 1a0674771..ae7fa8d14 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1406,7 +1407,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index a0202856c..2f2369c46 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -82,7 +82,27 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bold{ + background-image: url("../../../view/theme/diabook-blue/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-blue/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-blue/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");} .icon.notifications { @@ -1287,6 +1307,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: #1872A2; @@ -1550,7 +1571,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 190533d17..f63f15fd9 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * 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.015) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-blue (Version: 1.015)"; +$diabook_version = "Diabook-blue (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -509,3 +509,30 @@ function restore_boxes(){ alert("Right-hand column was restored. Please refresh your browser"); } ';} + +$a->page['htmlhead'] .= ' + + '; diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl new file mode 100644 index 000000000..4668b9ce3 --- /dev/null +++ b/view/theme/diabook-red/comment_item.tpl @@ -0,0 +1,39 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + video + img + i + u + b + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png new file mode 100644 index 000000000..9a1b32113 Binary files /dev/null and b/view/theme/diabook-red/icons/bb-image.png differ diff --git a/view/theme/diabook-red/icons/bb-video.png b/view/theme/diabook-red/icons/bb-video.png new file mode 100644 index 000000000..bd323531e Binary files /dev/null and b/view/theme/diabook-red/icons/bb-video.png differ diff --git a/view/theme/diabook-red/icons/bold.png b/view/theme/diabook-red/icons/bold.png new file mode 100644 index 000000000..8fab2a10f Binary files /dev/null and b/view/theme/diabook-red/icons/bold.png differ diff --git a/view/theme/diabook-red/icons/italic.png b/view/theme/diabook-red/icons/italic.png new file mode 100644 index 000000000..bf4b2b81d Binary files /dev/null and b/view/theme/diabook-red/icons/italic.png differ diff --git a/view/theme/diabook-red/icons/underline.png b/view/theme/diabook-red/icons/underline.png new file mode 100644 index 000000000..b1b4d3574 Binary files /dev/null and b/view/theme/diabook-red/icons/underline.png differ diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 8d5e3fec9..8be39e374 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1444,7 +1445,7 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper { - margin: 1px 0px 0px 80px; + margin: 1px 5px 17px 80px; background-color: #fff; width: 500px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 570057b47..242c08c68 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 883f11374..0cf034a56 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -82,7 +82,27 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ - +.icon.bold{ + background-image: url("../../../view/theme/diabook-red/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook-red/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook-red/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook-red/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook-red/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook-red/icons/contacts.png");} .icon.notifications { @@ -1317,6 +1337,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .tread-wrapper a{ color: red; @@ -1579,7 +1600,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 85206baec..aec3ab95d 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * 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.015) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.015)"; +$diabook_version = "Diabook-red (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -509,4 +509,31 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -';} \ No newline at end of file +';} + +$a->page['htmlhead'] .= ' + + '; \ No newline at end of file diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl new file mode 100644 index 000000000..4668b9ce3 --- /dev/null +++ b/view/theme/diabook/comment_item.tpl @@ -0,0 +1,39 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + video + img + i + u + b + {{ if $qcomment }} + + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png new file mode 100644 index 000000000..9a1b32113 Binary files /dev/null and b/view/theme/diabook/icons/bb-image.png differ diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png new file mode 100644 index 000000000..bd323531e Binary files /dev/null and b/view/theme/diabook/icons/bb-video.png differ diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png new file mode 100644 index 000000000..8fab2a10f Binary files /dev/null and b/view/theme/diabook/icons/bold.png differ diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png new file mode 100644 index 000000000..bf4b2b81d Binary files /dev/null and b/view/theme/diabook/icons/italic.png differ diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png new file mode 100644 index 000000000..b1b4d3574 Binary files /dev/null and b/view/theme/diabook/icons/underline.png differ diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 9e57c17d2..ed7c76cbe 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .wall-item-decor { position: absolute; @@ -1385,7 +1386,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 95e9061ba..51eb61253 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out; padding: 5px; margin-bottom: 0px; width: 575px; + padding-top: 10px; } .wall-item-decor { position: absolute; @@ -1379,7 +1380,7 @@ transition: all 0.2s ease-in-out; padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index d11e3191a..229076484 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -83,6 +83,27 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bold{ + background-image: url("../../../view/theme/diabook/icons/bold.png"); + float: right; + margin-top: 2px;} +.icon.underline{ + background-image: url("../../../view/theme/diabook/icons/underline.png"); + float: right; + margin-top: 2px;} +.icon.italic{ + background-image: url("../../../view/theme/diabook/icons/italic.png"); + float: right; + margin-top: 2px;} +.icon.bb-image{ + background-image: url("../../../view/theme/diabook/icons/bb-image.png"); + float: right; + margin-top: 2px;} +.icon.bb-video{ + background-image: url("../../../view/theme/diabook/icons/bb-video.png"); + float: right; + margin-top: 2px;} + .icon.contacts { background-image: url("../../../view/theme/diabook/icons/contacts.png");} .icon.notifications { @@ -1269,6 +1290,7 @@ body .pageheader{ padding: 5px; margin-bottom: 0px; width: 775px; + padding-top: 10px; } .wall-item-decor { @@ -1516,7 +1538,7 @@ body .pageheader{ padding-left: 12px; } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 5px 17px 80px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 924639625..bf31c08eb 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * 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.015) + * Version: (Version: 1.016) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.015)"; +$diabook_version = "Diabook (Version: 1.016)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -519,4 +519,31 @@ function restore_boxes(){ $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } -';} \ No newline at end of file +';} + +$a->page['htmlhead'] .= ' + + '; \ No newline at end of file -- cgit v1.2.3 From 707a5dbae7fa895186d73abd22486dab33710dc6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 05:48:42 -0400 Subject: aaah, nice asides ;). we'll be updating these soon Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 4 +- view/theme/dispy-dark/default.php | 9 +- view/theme/dispy-dark/style.css | 4 +- view/theme/dispy-dark/theme.php | 238 ++++++++++++++++---------------- view/theme/dispy/communityhome.tpl | 4 +- view/theme/dispy/default.php | 9 +- view/theme/dispy/nav.tpl | 3 - view/theme/dispy/style.css | 4 +- view/theme/dispy/theme.php | 231 ++++++++++++++++--------------- view/theme/dispy/wall_item.tpl | 19 ++- view/theme/dispy/wallwall_item.tpl | 21 ++- 11 files changed, 278 insertions(+), 268 deletions(-) (limited to 'view') diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216c..edabab611 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,10 +37,8 @@ {{ endif }} -{{ if $lastusers_title }} -

PostIt to Friendica

+

'PostIt' to Friendica

Post to Friendica from anywhere by bookmarking this link.
-{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index e74ec1a4f..24df92a72 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -7,13 +7,18 @@ - -