]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 25 Apr 2012 07:05:47 +0000 (03:05 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 25 Apr 2012 07:05:47 +0000 (03:05 -0400)
* remotes/upstream/master:
  diabook-themes: fix css to login.tpl
  restore qcomment selector
  rev update
  zero-themes: add bbcode-toolbar to commentbox
  diabook-themes: small fix
  Diabook-dark css fix
  Diabook-dark, couple of new icons, and another css fix.
  fix tags test with new url
  quattro: small week calendar view for event/birthday reminders
  remove html from get_birthdays() and get_events()
  events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])

* master:

50 files changed:
boot.php
tests/get_tags_test.php
util/messages.po
view/birthdays_reminder.tpl [new file with mode: 0644]
view/event_head.tpl
view/events_reminder.tpl [new file with mode: 0644]
view/theme/darkzero-NS/comment_item.tpl [new file with mode: 0755]
view/theme/darkzero-NS/editicons.png [new file with mode: 0644]
view/theme/darkzero-NS/theme.php
view/theme/darkzero/comment_item.tpl [new file with mode: 0755]
view/theme/darkzero/editicons.png [new file with mode: 0644]
view/theme/darkzero/theme.php
view/theme/diabook/diabook-aerith/style-wide.css
view/theme/diabook/diabook-aerith/style.css
view/theme/diabook/diabook-blue/style-wide.css
view/theme/diabook/diabook-blue/style.css
view/theme/diabook/diabook-dark/icons/pencil.png
view/theme/diabook/diabook-dark/icons/pencil2.png
view/theme/diabook/diabook-dark/icons/scroll_top.png
view/theme/diabook/diabook-dark/style-network.css
view/theme/diabook/diabook-dark/style-profile.css
view/theme/diabook/diabook-green/style-wide.css
view/theme/diabook/diabook-green/style.css
view/theme/diabook/diabook-pink/style-wide.css
view/theme/diabook/diabook-pink/style.css
view/theme/diabook/diabook-red/style-wide.css
view/theme/diabook/diabook-red/style.css
view/theme/diabook/icons/scroll_bottom.png [new file with mode: 0644]
view/theme/diabook/nav.tpl
view/theme/diabook/style-wide.css
view/theme/diabook/style.css
view/theme/diabook/theme.php
view/theme/duepuntozero/comment_item.tpl [new file with mode: 0755]
view/theme/duepuntozero/editicons.png [new file with mode: 0644]
view/theme/duepuntozero/style.css
view/theme/duepuntozero/theme.php
view/theme/greenzero/comment_item.tpl [new file with mode: 0755]
view/theme/greenzero/editicons.png [new file with mode: 0644]
view/theme/greenzero/theme.php
view/theme/purplezero/comment_item.tpl [new file with mode: 0755]
view/theme/purplezero/editicons.png [new file with mode: 0644]
view/theme/purplezero/theme.php
view/theme/quattro/birthdays_reminder.tpl [new file with mode: 0644]
view/theme/quattro/events_reminder.tpl [new file with mode: 0644]
view/theme/slack-NS/comment_item.tpl [new file with mode: 0755]
view/theme/slack-NS/editicons.png [new file with mode: 0644]
view/theme/slack-NS/theme.php
view/theme/slackr/comment_item.tpl [new file with mode: 0755]
view/theme/slackr/editicons.png [new file with mode: 0644]
view/theme/slackr/theme.php

index d2758c643ca692e588685e0d0e0e45bc53cdefc8..8b25dff4624b48e63128b9d895441b201fb15d40 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1321' );
+define ( 'FRIENDICA_VERSION',      '2.3.1322' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 
@@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) {
                        }
                        $classtoday = $istoday ? ' birthday-today ' : '';
                        if($total) {
-                               $o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
-                               $o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
-                               $o .= '<div id="birthday-title-end"></div>';
-
-                               foreach($r as $rr) {
+                               foreach($r as &$rr) {
                                        if(! strlen($rr['name']))
                                                continue;
 
@@ -1196,15 +1192,24 @@ if(! function_exists('get_birthdays')) {
                                                $url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
                                        }
        
-                                       $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
-                                       . $url . '">' . $rr['name'] . '</a> '
-                                       . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
-                                       . '</div>' ;
+                                       $rr['link'] = $url;
+                                       $rr['title'] = $rr['name'];
+                                       $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
+                                       $rr['startime'] = Null;
+                                       $rr['today'] = $today;
+       
                                }
-                               $o .= '</div></div>';
                        }
                }
-               return $o;
+               $tpl = get_markup_template("birthdays_reminder.tpl");
+               return replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$classtoday' => $classtoday,
+                       '$count' => $total,
+                       '$event_reminders' => t('Birthday Reminders'),
+                       '$event_title' => t('Birthdays this week:'),
+                       '$events' => $r,
+               ));
        }
 }
 
@@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) {
                require_once('include/bbcode.php');
 
                $a = get_app();
-               $o = '';
 
                if(! local_user())
                        return $o;
@@ -1242,18 +1246,15 @@ if(! function_exists('get_events')) {
                                if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
                                        $istoday = true;
                        }
-                       $classtoday = (($istoday) ? ' event-today ' : '');
+                       $classtoday = (($istoday) ? 'event-today' : '');
 
-                       $o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
-                       $o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
-                       $o .= '<div id="event-title-end"></div>';
-
-                       foreach($r as $rr) {
 
+                       foreach($r as &$rr) {
                                if($rr['adjust'])
-                                       $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
+                                       $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m');
                                else
-                                       $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
+                                       $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
+                               $md .= "/#link-".$rr['id'];
 
                                $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
                                if(! $title)
@@ -1261,15 +1262,24 @@ if(! function_exists('get_events')) {
 
                                $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
                                $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-
-                               $o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
-                               . day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
-                               . '</div>' ;
+                               
+                               $rr['link'] = $md;
+                               $rr['title'] = $title;
+                               $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
+                               $rr['startime'] = $strt;
+                               $rr['today'] = $today;
                        }
-                       $o .= '</div></div>';
                }
 
-               return $o;
+               $tpl = get_markup_template("events_reminder.tpl");
+               return replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$classtoday' => $classtoday,
+                       '$count' => count($r),
+                       '$event_reminders' => t('Event Reminders'),
+                       '$event_title' => t('Events this week:'),
+                       '$events' => $r,
+               ));
        }
 }
 
index e5c6485de94ba880409727a74d9b575520d7b09a..40f016747f8a93ea8a971238e958a9904fdd8682 100644 (file)
@@ -202,8 +202,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                }
                \r
                $this->assertEquals("cid:15", $inform); 
-               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags);
-               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text); 
+               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags);
+               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); 
                \r
        }\r
 
index 43a02bea4055ab25844afb30f724d7066710cdd5..651eafbcdcbee7f46d78ee04bbdb89f9b020aa59 100644 (file)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1321\n"
+"Project-Id-Version: 2.3.1322\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-23 10:00-0700\n"
+"POT-Creation-Date: 2012-04-24 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,7 +127,7 @@ msgstr ""
 #: ../../mod/photos.php:1193 ../../mod/photos.php:1233
 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304
 #: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:296
 #: ../../mod/settings.php:532 ../../mod/settings.php:678
 #: ../../mod/settings.php:739 ../../mod/settings.php:930
 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
@@ -139,7 +139,7 @@ msgstr ""
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
@@ -158,12 +158,6 @@ msgstr ""
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/diabook/diabook-green/config.php:76
-#: ../../view/theme/diabook/diabook-red/config.php:76
-#: ../../view/theme/diabook/diabook-blue/config.php:76
-#: ../../view/theme/diabook/diabook-dark/config.php:76
-#: ../../view/theme/diabook/diabook-aerith/config.php:76
-#: ../../view/theme/diabook/diabook-pink/config.php:76
 #: ../../view/theme/diabook/config.php:91
 #: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
 msgid "Submit"
@@ -223,14 +217,7 @@ msgstr ""
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:296
-#: ../../view/theme/diabook/diabook-green/theme.php:233
-#: ../../view/theme/diabook/diabook-red/theme.php:231
-#: ../../view/theme/diabook/diabook-blue/theme.php:231
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook/diabook-dark/theme.php:233
-#: ../../view/theme/diabook/diabook-aerith/theme.php:233
-#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:250
 #: ../../include/nav.php:52 ../../boot.php:1471
 msgid "Events"
 msgstr ""
@@ -290,7 +277,7 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:800 ../../mod/settings.php:533
+#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:533
 #: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -334,7 +321,7 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:788
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:800
 #: ../../mod/settings.php:844 ../../mod/settings.php:850
 #: ../../mod/settings.php:858 ../../mod/settings.php:862
 #: ../../mod/settings.php:867 ../../mod/settings.php:873
@@ -345,7 +332,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:789
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:801
 #: ../../mod/settings.php:844 ../../mod/settings.php:850
 #: ../../mod/settings.php:858 ../../mod/settings.php:862
 #: ../../mod/settings.php:867 ../../mod/settings.php:873
@@ -363,13 +350,7 @@ msgstr ""
 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/diabook-green/theme.php:116
-#: ../../view/theme/diabook/diabook-red/theme.php:115
-#: ../../view/theme/diabook/diabook-blue/theme.php:115
 #: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/diabook-dark/theme.php:116
-#: ../../view/theme/diabook/diabook-aerith/theme.php:116
-#: ../../view/theme/diabook/diabook-pink/theme.php:116
 msgid "Contact Photos"
 msgstr ""
 
@@ -392,13 +373,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/diabook-green/theme.php:117
-#: ../../view/theme/diabook/diabook-red/theme.php:116
-#: ../../view/theme/diabook/diabook-blue/theme.php:116
 #: ../../view/theme/diabook/theme.php:131
-#: ../../view/theme/diabook/diabook-dark/theme.php:117
-#: ../../view/theme/diabook/diabook-aerith/theme.php:117
-#: ../../view/theme/diabook/diabook-pink/theme.php:117
 msgid "Profile Photos"
 msgstr ""
 
@@ -420,15 +395,9 @@ msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/diabook-green/theme.php:88
-#: ../../view/theme/diabook/diabook-red/theme.php:87
-#: ../../view/theme/diabook/diabook-blue/theme.php:87
-#: ../../view/theme/diabook/theme.php:102
-#: ../../view/theme/diabook/diabook-dark/theme.php:88
-#: ../../view/theme/diabook/diabook-aerith/theme.php:88
-#: ../../view/theme/diabook/diabook-pink/theme.php:88
-#: ../../include/text.php:1304 ../../include/diaspora.php:1654
-#: ../../include/conversation.php:53 ../../include/conversation.php:126
+#: ../../view/theme/diabook/theme.php:102 ../../include/text.php:1304
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
@@ -455,7 +424,7 @@ msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:719 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
@@ -601,19 +570,12 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30
-#: ../../view/theme/diabook/diabook-green/theme.php:235
-#: ../../view/theme/diabook/diabook-red/theme.php:233
-#: ../../view/theme/diabook/diabook-blue/theme.php:233
-#: ../../view/theme/diabook/theme.php:252
-#: ../../view/theme/diabook/diabook-dark/theme.php:235
-#: ../../view/theme/diabook/diabook-aerith/theme.php:235
-#: ../../view/theme/diabook/diabook-pink/theme.php:235
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:252
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:115
+#: ../../mod/community.php:61 ../../mod/search.php:128
 msgid "No results."
 msgstr ""
 
@@ -730,19 +692,19 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:475
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:487
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:480
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:492
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:482
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:494
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:485
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:497
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -786,128 +748,128 @@ msgstr ""
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:420
+#: ../../mod/dfrn_request.php:432
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:433
+#: ../../mod/dfrn_request.php:445
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:437
+#: ../../mod/dfrn_request.php:449
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:458
+#: ../../mod/dfrn_request.php:470
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:464 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:533 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:545 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:554
+#: ../../mod/dfrn_request.php:566
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:607
+#: ../../mod/dfrn_request.php:619
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/dfrn_request.php:633
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:633
+#: ../../mod/dfrn_request.php:645
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:634
+#: ../../mod/dfrn_request.php:646
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:635
+#: ../../mod/dfrn_request.php:647
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:676 ../../include/items.php:2691
+#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:763
+#: ../../mod/dfrn_request.php:775
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:779
+#: ../../mod/dfrn_request.php:791
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:781
+#: ../../mod/dfrn_request.php:793
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:784
+#: ../../mod/dfrn_request.php:796
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:785
+#: ../../mod/dfrn_request.php:797
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:786
+#: ../../mod/dfrn_request.php:798
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:787
+#: ../../mod/dfrn_request.php:799
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:790
+#: ../../mod/dfrn_request.php:802
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:792 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:804 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:793
+#: ../../mod/dfrn_request.php:805
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:794 ../../mod/settings.php:629
+#: ../../mod/dfrn_request.php:806 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:795
+#: ../../mod/dfrn_request.php:807
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:796
+#: ../../mod/dfrn_request.php:808
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:799
+#: ../../mod/dfrn_request.php:811
 msgid "Submit Request"
 msgstr ""
 
@@ -1233,8 +1195,8 @@ msgid "Discard"
 msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
-#: ../../mod/contacts.php:351
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:279
+#: ../../mod/contacts.php:322
 msgid "Ignore"
 msgstr ""
 
@@ -1250,14 +1212,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:90
-#: ../../view/theme/diabook/diabook-green/theme.php:229
-#: ../../view/theme/diabook/diabook-red/theme.php:227
-#: ../../view/theme/diabook/diabook-blue/theme.php:227
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook/diabook-dark/theme.php:229
-#: ../../view/theme/diabook/diabook-aerith/theme.php:229
-#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:246
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@@ -1293,7 +1248,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:327
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1443,218 +1398,207 @@ msgstr ""
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:200
-msgid "stopped following"
-msgstr ""
-
-#: ../../mod/contacts.php:221
+#: ../../mod/contacts.php:192
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:251
+#: ../../mod/contacts.php:222
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:226
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:260
+#: ../../mod/contacts.php:231
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:277
+#: ../../mod/contacts.php:248
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:251
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:255
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:255
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:286
+#: ../../mod/contacts.php:257
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:290
+#: ../../mod/contacts.php:261
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:264
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:269
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/contacts.php:274 ../../mod/contacts.php:321
 #: ../../mod/admin.php:579
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/contacts.php:274 ../../mod/contacts.php:321
 #: ../../mod/admin.php:578
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
+#: ../../mod/contacts.php:279 ../../mod/contacts.php:322
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:284
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:294
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:297
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:298
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:299
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:300
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
+#: ../../mod/contacts.php:305 ../../mod/contacts.php:478
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:306
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:336
+#: ../../mod/contacts.php:307
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:308
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:309
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:340
+#: ../../mod/contacts.php:311
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:344
+#: ../../mod/contacts.php:315
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:345
+#: ../../mod/contacts.php:316
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:347 ../../mod/admin.php:1051
+#: ../../mod/contacts.php:318 ../../mod/admin.php:1051
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:325
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:326
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:327
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:405
+#: ../../mod/contacts.php:376
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:410 ../../mod/group.php:191
+#: ../../mod/contacts.php:381 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:415
+#: ../../mod/contacts.php:386
 msgid "Unblocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:421
+#: ../../mod/contacts.php:392
 msgid "Blocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:398
 msgid "Ignored Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:433
+#: ../../mod/contacts.php:404
 msgid "Hidden Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:483
+#: ../../mod/contacts.php:454
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:487
+#: ../../mod/contacts.php:458
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:491
+#: ../../mod/contacts.php:462
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:479 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:529
-#: ../../view/theme/diabook/diabook-green/theme.php:231
-#: ../../view/theme/diabook/diabook-red/theme.php:229
-#: ../../view/theme/diabook/diabook-blue/theme.php:229
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook/diabook-dark/theme.php:231
-#: ../../view/theme/diabook/diabook-aerith/theme.php:231
-#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../mod/contacts.php:500 ../../view/theme/diabook/theme.php:248
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:504
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:534 ../../mod/directory.php:57
+#: ../../mod/contacts.php:505 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../mod/contacts.php:506 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -1810,7 +1754,7 @@ msgid " Cannot change to that email."
 msgstr ""
 
 #: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
-#: ../../addon/impressum/impressum.php:75
+#: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
 #: ../../addon/twitter/twitter.php:370
@@ -2554,14 +2498,7 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103
-#: ../../view/theme/diabook/diabook-green/theme.php:230
-#: ../../view/theme/diabook/diabook-red/theme.php:228
-#: ../../view/theme/diabook/diabook-blue/theme.php:228
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook/diabook-dark/theme.php:230
-#: ../../view/theme/diabook/diabook-aerith/theme.php:230
-#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:247
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
 #: ../../include/nav.php:50 ../../boot.php:1458
 msgid "Profile"
@@ -2747,36 +2684,17 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1533
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/diabook-green/theme.php:83
-#: ../../view/theme/diabook/diabook-green/theme.php:92
-#: ../../view/theme/diabook/diabook-red/theme.php:82
-#: ../../view/theme/diabook/diabook-red/theme.php:91
-#: ../../view/theme/diabook/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/diabook-blue/theme.php:91
 #: ../../view/theme/diabook/theme.php:97
-#: ../../view/theme/diabook/theme.php:106
-#: ../../view/theme/diabook/diabook-dark/theme.php:83
-#: ../../view/theme/diabook/diabook-dark/theme.php:92
-#: ../../view/theme/diabook/diabook-aerith/theme.php:83
-#: ../../view/theme/diabook/diabook-aerith/theme.php:92
-#: ../../view/theme/diabook/diabook-pink/theme.php:83
-#: ../../view/theme/diabook/diabook-pink/theme.php:92
-#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
-#: ../../include/conversation.php:57 ../../include/conversation.php:121
-#: ../../include/conversation.php:130
+#: ../../view/theme/diabook/theme.php:106 ../../include/diaspora.php:1654
+#: ../../include/conversation.php:48 ../../include/conversation.php:57
+#: ../../include/conversation.php:121 ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/diabook-green/theme.php:97
-#: ../../view/theme/diabook/diabook-red/theme.php:96
-#: ../../view/theme/diabook/diabook-blue/theme.php:96
-#: ../../view/theme/diabook/theme.php:111
-#: ../../view/theme/diabook/diabook-dark/theme.php:97
-#: ../../view/theme/diabook/diabook-aerith/theme.php:97
-#: ../../view/theme/diabook/diabook-pink/theme.php:97
-#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
+#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1670
+#: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2796,14 +2714,7 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:23
-#: ../../view/theme/diabook/diabook-green/theme.php:232
-#: ../../view/theme/diabook/diabook-red/theme.php:230
-#: ../../view/theme/diabook/diabook-blue/theme.php:230
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook/diabook-dark/theme.php:232
-#: ../../view/theme/diabook/diabook-aerith/theme.php:232
-#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:249
 #: ../../include/nav.php:51 ../../boot.php:1463
 msgid "Photos"
 msgstr ""
@@ -3956,14 +3867,7 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38
-#: ../../view/theme/diabook/diabook-green/theme.php:145
-#: ../../view/theme/diabook/diabook-red/theme.php:143
-#: ../../view/theme/diabook/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:158
-#: ../../view/theme/diabook/diabook-dark/theme.php:145
-#: ../../view/theme/diabook/diabook-aerith/theme.php:145
-#: ../../view/theme/diabook/diabook-pink/theme.php:145
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:158
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -3978,14 +3882,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47
-#: ../../view/theme/diabook/diabook-green/theme.php:143
-#: ../../view/theme/diabook/diabook-red/theme.php:141
-#: ../../view/theme/diabook/diabook-blue/theme.php:141
-#: ../../view/theme/diabook/theme.php:156
-#: ../../view/theme/diabook/diabook-dark/theme.php:143
-#: ../../view/theme/diabook/diabook-aerith/theme.php:143
-#: ../../view/theme/diabook/diabook-pink/theme.php:143
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:156
 msgid "Global Directory"
 msgstr ""
 
@@ -4543,15 +4440,8 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/diabook-green/theme.php:80
-#: ../../view/theme/diabook/diabook-red/theme.php:79
-#: ../../view/theme/diabook/diabook-blue/theme.php:79
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/diabook-dark/theme.php:80
-#: ../../view/theme/diabook/diabook-aerith/theme.php:80
-#: ../../view/theme/diabook/diabook-pink/theme.php:80
-#: ../../include/text.php:1302 ../../include/conversation.php:45
-#: ../../include/conversation.php:118
+#: ../../view/theme/diabook/theme.php:94 ../../include/text.php:1302
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
@@ -4758,67 +4648,69 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:34
+#: ../../addon/impressum/impressum.php:36
 msgid "Impressum"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:47
 #: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:81
+#: ../../addon/impressum/impressum.php:51
+#: ../../addon/impressum/impressum.php:83
 msgid "Site Owner"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:47
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:87
 msgid "Email Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:52
-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:54
+#: ../../addon/impressum/impressum.php:85
 msgid "Postal Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:58
+#: ../../addon/impressum/impressum.php:60
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:81
+#: ../../addon/impressum/impressum.php:83
 msgid "The page operators name."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:82
+#: ../../addon/impressum/impressum.php:84
 msgid "Site Owners Profile"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:82
+#: ../../addon/impressum/impressum.php:84
 msgid "Profile address of the operator."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:83
-msgid "How to contact the operator via snail mail."
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:86
 msgid "Notes"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:84
-msgid "Additional notes that are displayed beneath the contact information."
+#: ../../addon/impressum/impressum.php:86
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can "
+"use BBCode here."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:85
+#: ../../addon/impressum/impressum.php:87
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:88
 msgid "Footer note"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:86
-msgid "Text for the footer."
+#: ../../addon/impressum/impressum.php:88
+msgid "Text for the footer. You can use BBCode here."
 msgstr ""
 
 #: ../../addon/buglink/buglink.php:15
@@ -5448,228 +5340,89 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:29
-#: ../../view/theme/diabook/diabook-red/theme.php:28
-#: ../../view/theme/diabook/diabook-blue/theme.php:28
 #: ../../view/theme/diabook/theme.php:43
-#: ../../view/theme/diabook/diabook-dark/theme.php:29
-#: ../../view/theme/diabook/diabook-aerith/theme.php:29
-#: ../../view/theme/diabook/diabook-pink/theme.php:29
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:58
-#: ../../view/theme/diabook/diabook-red/theme.php:57
-#: ../../view/theme/diabook/diabook-blue/theme.php:57
 #: ../../view/theme/diabook/theme.php:72
-#: ../../view/theme/diabook/diabook-dark/theme.php:58
-#: ../../view/theme/diabook/diabook-aerith/theme.php:58
-#: ../../view/theme/diabook/diabook-pink/theme.php:58
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:103
-#: ../../view/theme/diabook/diabook-red/theme.php:102
-#: ../../view/theme/diabook/diabook-blue/theme.php:102
 #: ../../view/theme/diabook/theme.php:117
-#: ../../view/theme/diabook/diabook-dark/theme.php:103
-#: ../../view/theme/diabook/diabook-aerith/theme.php:103
-#: ../../view/theme/diabook/diabook-pink/theme.php:103
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:141
-#: ../../view/theme/diabook/diabook-red/theme.php:139
-#: ../../view/theme/diabook/diabook-blue/theme.php:139
 #: ../../view/theme/diabook/theme.php:154
-#: ../../view/theme/diabook/diabook-dark/theme.php:141
-#: ../../view/theme/diabook/diabook-aerith/theme.php:141
-#: ../../view/theme/diabook/diabook-pink/theme.php:141
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:142
-#: ../../view/theme/diabook/diabook-red/theme.php:140
-#: ../../view/theme/diabook/diabook-blue/theme.php:140
 #: ../../view/theme/diabook/theme.php:155
-#: ../../view/theme/diabook/diabook-dark/theme.php:142
-#: ../../view/theme/diabook/diabook-aerith/theme.php:142
-#: ../../view/theme/diabook/diabook-pink/theme.php:142
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:144
-#: ../../view/theme/diabook/diabook-red/theme.php:142
-#: ../../view/theme/diabook/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:157
-#: ../../view/theme/diabook/diabook-dark/theme.php:144
-#: ../../view/theme/diabook/diabook-aerith/theme.php:144
-#: ../../view/theme/diabook/diabook-pink/theme.php:144
-#: ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:157 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:146
-#: ../../view/theme/diabook/diabook-red/theme.php:144
-#: ../../view/theme/diabook/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:159
-#: ../../view/theme/diabook/diabook-dark/theme.php:146
-#: ../../view/theme/diabook/diabook-aerith/theme.php:146
-#: ../../view/theme/diabook/diabook-pink/theme.php:146
-#: ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:159 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:161
-#: ../../view/theme/diabook/diabook-green/theme.php:236
-#: ../../view/theme/diabook/diabook-red/theme.php:159
-#: ../../view/theme/diabook/diabook-red/theme.php:234
-#: ../../view/theme/diabook/diabook-blue/theme.php:159
-#: ../../view/theme/diabook/diabook-blue/theme.php:234
 #: ../../view/theme/diabook/theme.php:175
 #: ../../view/theme/diabook/theme.php:253
-#: ../../view/theme/diabook/diabook-dark/theme.php:161
-#: ../../view/theme/diabook/diabook-dark/theme.php:236
-#: ../../view/theme/diabook/diabook-aerith/theme.php:161
-#: ../../view/theme/diabook/diabook-aerith/theme.php:236
-#: ../../view/theme/diabook/diabook-pink/theme.php:161
-#: ../../view/theme/diabook/diabook-pink/theme.php:236
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:194
-#: ../../view/theme/diabook/diabook-red/theme.php:192
-#: ../../view/theme/diabook/diabook-blue/theme.php:192
 #: ../../view/theme/diabook/theme.php:208
-#: ../../view/theme/diabook/diabook-dark/theme.php:194
-#: ../../view/theme/diabook/diabook-aerith/theme.php:194
-#: ../../view/theme/diabook/diabook-pink/theme.php:194
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:200
-#: ../../view/theme/diabook/diabook-red/theme.php:198
-#: ../../view/theme/diabook/diabook-blue/theme.php:198
 #: ../../view/theme/diabook/theme.php:214
-#: ../../view/theme/diabook/diabook-dark/theme.php:200
-#: ../../view/theme/diabook/diabook-aerith/theme.php:200
-#: ../../view/theme/diabook/diabook-pink/theme.php:200
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:229
-#: ../../view/theme/diabook/diabook-red/theme.php:227
-#: ../../view/theme/diabook/diabook-blue/theme.php:227
-#: ../../view/theme/diabook/theme.php:246
-#: ../../view/theme/diabook/diabook-dark/theme.php:229
-#: ../../view/theme/diabook/diabook-aerith/theme.php:229
-#: ../../view/theme/diabook/diabook-pink/theme.php:229
-#: ../../include/nav.php:49 ../../include/nav.php:115
+#: ../../view/theme/diabook/theme.php:246 ../../include/nav.php:49
+#: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:230
-#: ../../view/theme/diabook/diabook-red/theme.php:228
-#: ../../view/theme/diabook/diabook-blue/theme.php:228
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook/diabook-dark/theme.php:230
-#: ../../view/theme/diabook/diabook-aerith/theme.php:230
-#: ../../view/theme/diabook/diabook-pink/theme.php:230
-#: ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:247 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:231
-#: ../../view/theme/diabook/diabook-red/theme.php:229
-#: ../../view/theme/diabook/diabook-blue/theme.php:229
 #: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook/diabook-dark/theme.php:231
-#: ../../view/theme/diabook/diabook-aerith/theme.php:231
-#: ../../view/theme/diabook/diabook-pink/theme.php:231
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:232
-#: ../../view/theme/diabook/diabook-red/theme.php:230
-#: ../../view/theme/diabook/diabook-blue/theme.php:230
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook/diabook-dark/theme.php:232
-#: ../../view/theme/diabook/diabook-aerith/theme.php:232
-#: ../../view/theme/diabook/diabook-pink/theme.php:232
-#: ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:249 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:233
-#: ../../view/theme/diabook/diabook-red/theme.php:231
-#: ../../view/theme/diabook/diabook-blue/theme.php:231
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook/diabook-dark/theme.php:233
-#: ../../view/theme/diabook/diabook-aerith/theme.php:233
-#: ../../view/theme/diabook/diabook-pink/theme.php:233
-#: ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:250 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:234
-#: ../../view/theme/diabook/diabook-red/theme.php:232
-#: ../../view/theme/diabook/diabook-blue/theme.php:232
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook/diabook-dark/theme.php:234
-#: ../../view/theme/diabook/diabook-aerith/theme.php:234
-#: ../../view/theme/diabook/diabook-pink/theme.php:234
-#: ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/theme.php:234
-#: ../../view/theme/diabook/diabook-red/theme.php:232
-#: ../../view/theme/diabook/diabook-blue/theme.php:232
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook/diabook-dark/theme.php:234
-#: ../../view/theme/diabook/diabook-aerith/theme.php:234
-#: ../../view/theme/diabook/diabook-pink/theme.php:234
-#: ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/config.php:78
-#: ../../view/theme/diabook/diabook-red/config.php:78
-#: ../../view/theme/diabook/diabook-blue/config.php:78
-#: ../../view/theme/diabook/diabook-dark/config.php:78
-#: ../../view/theme/diabook/diabook-aerith/config.php:78
-#: ../../view/theme/diabook/diabook-pink/config.php:78
 #: ../../view/theme/diabook/config.php:93
 #: ../../view/theme/quattro/config.php:54
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/config.php:79
-#: ../../view/theme/diabook/diabook-red/config.php:79
-#: ../../view/theme/diabook/diabook-blue/config.php:79
-#: ../../view/theme/diabook/diabook-dark/config.php:79
-#: ../../view/theme/diabook/diabook-aerith/config.php:79
-#: ../../view/theme/diabook/diabook-pink/config.php:79
 #: ../../view/theme/diabook/config.php:94
 msgid "Set font-size for posts and comments"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/config.php:80
-#: ../../view/theme/diabook/diabook-red/config.php:80
-#: ../../view/theme/diabook/diabook-blue/config.php:80
-#: ../../view/theme/diabook/diabook-dark/config.php:80
-#: ../../view/theme/diabook/diabook-aerith/config.php:80
-#: ../../view/theme/diabook/diabook-pink/config.php:80
 #: ../../view/theme/diabook/config.php:95
 msgid "Set line-height for posts and comments"
 msgstr ""
 
-#: ../../view/theme/diabook/diabook-green/config.php:81
-#: ../../view/theme/diabook/diabook-red/config.php:81
-#: ../../view/theme/diabook/diabook-blue/config.php:81
-#: ../../view/theme/diabook/diabook-dark/config.php:81
-#: ../../view/theme/diabook/diabook-aerith/config.php:81
-#: ../../view/theme/diabook/diabook-pink/config.php:81
 #: ../../view/theme/diabook/config.php:96
 msgid "Set resolution for middle column"
 msgstr ""
@@ -6817,29 +6570,33 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:145 ../../include/conversation.php:809
+#: ../../include/Contact.php:96
+msgid "stopped following"
+msgstr ""
+
+#: ../../include/Contact.php:188 ../../include/conversation.php:809
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:146 ../../include/conversation.php:810
+#: ../../include/Contact.php:189 ../../include/conversation.php:810
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:147 ../../include/conversation.php:811
+#: ../../include/Contact.php:190 ../../include/conversation.php:811
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/Contact.php:191 ../../include/Contact.php:204
 #: ../../include/conversation.php:812
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/Contact.php:192 ../../include/Contact.php:204
 #: ../../include/conversation.php:813
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/Contact.php:193 ../../include/Contact.php:204
 #: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr ""
diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl
new file mode 100644 (file)
index 0000000..c0422c1
--- /dev/null
@@ -0,0 +1,10 @@
+{{ if $count }}
+<div id="birthday-notice" class="birthday-notice fakelink' $classtoday" onclick="openClose('birthday-wrapper');">$event_reminders ($count)</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
+<div id="birthday-title-end"></div>
+{{ for $events as $event }}
+<div class="birthday-list" id="birthday-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
+{{ endfor }}
+</div></div>
+{{ endif }}
+
index 97201e722988adb98e11eaa09d6403dd507439d6..471748b97ab7db668f2c9d83c4d60f315c8034bb 100644 (file)
@@ -3,8 +3,17 @@
           src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
 
 <script>
+       function showEvent(eventid) {
+               $.get(
+                       '$baseurl/events/?id='+eventid,
+                       function(data){
+                               $.fancybox(data);
+                       }
+               );                      
+       }
+       
        $(document).ready(function() {
-           $('#events-calendar').fullCalendar({
+               $('#events-calendar').fullCalendar({
                        events: '$baseurl/events/json/',
                        header: {
                                left: 'prev,next today',
                        },                      
                        timeFormat: 'H(:mm)',
                        eventClick: function(calEvent, jsEvent, view) {
-                               $.get(
-                                       '$baseurl/events/?id='+calEvent.id,
-                                       function(data){
-                                               $.fancybox(data);
-                                       }
-                               );
+                               showEvent(calEvent.id);
                        },
                        
                        eventRender: function(event, element, view) {
                        }
                        
                })
+               
+               // center on date
+               var args=location.href.replace(baseurl,"").split("/");
+               if (args.length>=4) {
+                       $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+               } 
+               
+               // show event popup
+               var hash = location.hash.split("-")
+               if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+               
        });
 </script>
 
 
 <script language="javascript" type="text/javascript"
           src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-
-tinyMCE.init({
-       theme : "advanced",
-       mode : "textareas",
-       plugins : "bbcode,paste",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-       theme_advanced_buttons2 : "",
-       theme_advanced_buttons3 : "",
-       theme_advanced_toolbar_location : "top",
-       theme_advanced_toolbar_align : "center",
-       theme_advanced_blockformats : "blockquote,code",
-       gecko_spellcheck : true,
-       paste_text_sticky : true,
-       entity_encoding : "raw",
-       add_unload_trigger : false,
-       remove_linebreaks : false,
-       force_p_newlines : false,
-       force_br_newlines : true,
-       forced_root_block : '',
-       content_css: "$baseurl/view/custom_tinymce.css",
-       theme_advanced_path : false,
-       setup : function(ed) {
-               ed.onInit.add(function(ed) {
-                       ed.pasteAsPlainText = true;
-               });
-       }
+<script language="javascript" type="text/javascript">
+
+
+       tinyMCE.init({
+               theme : "advanced",
+               mode : "textareas",
+               plugins : "bbcode,paste",
+               theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+               theme_advanced_buttons2 : "",
+               theme_advanced_buttons3 : "",
+               theme_advanced_toolbar_location : "top",
+               theme_advanced_toolbar_align : "center",
+               theme_advanced_blockformats : "blockquote,code",
+               gecko_spellcheck : true,
+               paste_text_sticky : true,
+               entity_encoding : "raw",
+               add_unload_trigger : false,
+               remove_linebreaks : false,
+               force_p_newlines : false,
+               force_br_newlines : true,
+               forced_root_block : '',
+               content_css: "$baseurl/view/custom_tinymce.css",
+               theme_advanced_path : false,
+               setup : function(ed) {
+                       ed.onInit.add(function(ed) {
+                               ed.pasteAsPlainText = true;
+                       });
+               }
 
-});
+       });
 
 
-$(document).ready(function() { 
+       $(document).ready(function() { 
 
-       $('#event-share-checkbox').change(function() {
+               $('#event-share-checkbox').change(function() {
 
-               if ($('#event-share-checkbox').is(':checked')) { 
-                       $('#acl-wrapper').show();
-               }
-               else {
-                       $('#acl-wrapper').hide();
-               }
-       }).trigger('change');
+                       if ($('#event-share-checkbox').is(':checked')) { 
+                               $('#acl-wrapper').show();
+                       }
+                       else {
+                               $('#acl-wrapper').hide();
+                       }
+               }).trigger('change');
 
 
-       $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-               var selstr;
-               $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-                       selstr = $(this).text();
-                       $('#jot-public').hide();
-               });
-               if(selstr == null) {
-                       $('#jot-public').show();
-               }
+               $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+                       var selstr;
+                       $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+                               selstr = $(this).text();
+                               $('#jot-public').hide();
+                       });
+                       if(selstr == null) {
+                               $('#jot-public').show();
+                       }
 
-       }).trigger('change');
+               }).trigger('change');
 
-});
+       });
 
 </script>
 
diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl
new file mode 100644 (file)
index 0000000..fe7e339
--- /dev/null
@@ -0,0 +1,10 @@
+{{ if $count }}
+<div id="event-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('event-wrapper');">$event_reminders ($count)</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
+<div id="event-title-end"></div>
+{{ for $events as $event }}
+<div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
+{{ endfor }}
+</div></div>
+{{ endif }}
+
diff --git a/view/theme/darkzero-NS/comment_item.tpl b/view/theme/darkzero-NS/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/darkzero-NS/editicons.png b/view/theme/darkzero-NS/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/darkzero-NS/editicons.png differ
index 6c1aa7f125296f4681f916b53d00eae270b0be3d..bdf4b8ceff41a44992ab5e0e8c37fbfd60034f36 100644 (file)
@@ -14,6 +14,41 @@ $a->theme_info = array(
 function darkzero_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/darkzero/comment_item.tpl b/view/theme/darkzero/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/darkzero/editicons.png b/view/theme/darkzero/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/darkzero/editicons.png differ
index bbba3ef740ccea9dbe5aae46fb48b21e18d6d9ee..dc0da0b167df1bb41e04a597ccf8424f39d1f133 100644 (file)
@@ -15,6 +15,42 @@ $a->theme_info = array(
 function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
+
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
index 388a05b46c67ca10124bf0cd9c0ed005d48c203b..b8ff1fe250c74dc9cbb256e708d12502385ad01c 100644 (file)
@@ -1243,7 +1243,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
index 1f3e65ccad8444f4d2ee6d90b76bbdbb1b096855..01d35b754108d714f31e4e443e13f6db52411d1b 100644 (file)
@@ -1241,7 +1241,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
index 7745e7e2d19e8a453b16f2334f6f192e5e30fc81..c8c2033473d6c6bb46098d5a6aff9b7ead031299 100644 (file)
@@ -1203,7 +1203,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
index 12648bffba4d1ae1796764104a3badfcaf7ee2ef..7bf7e8eaa714d3f6b9c1e748c19740b2cb52785d 100644 (file)
@@ -1201,7 +1201,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
index 772e49b175e0674443262034180b5ff789715107..cc316a7de9db50749045cc02b43962dfcb6229f1 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/pencil.png and b/view/theme/diabook/diabook-dark/icons/pencil.png differ
index 3b47d1864bbf50c59b237f8aa18d90c350b53339..791433db7a2c79aff1b2dcd19ab1bd1ea7454e8a 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/pencil2.png and b/view/theme/diabook/diabook-dark/icons/pencil2.png differ
index 0e7f7ae6a61ddfe1d1a9aa67b26a3e3c2d41b88e..fe20d1c4ce9f85c1eabd431cba1eed4a9af42538 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/scroll_top.png and b/view/theme/diabook/diabook-dark/icons/scroll_top.png differ
index d236297b77c8b9d726484027c4a69ad9cfb08d74..7ddedb320b04aab59cce2ad57962c1d6a5b122ac 100644 (file)
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: #3465a4;
+  color: #88a9d2;
 }
 .tool a:hover {
   text-decoration: none;
index 8824d18fe3c5fade99f267acf70a7075785dfb95..b052b77ff448453ef50a09895d0424a18b7cef4b 100644 (file)
@@ -440,7 +440,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: ##3465a4;
 }
 .tool a:hover {
   text-decoration: none;
@@ -1261,7 +1261,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {
index e07af7c697b2de4071eaf0ace1dd17d23a9f8164..d85ea23a6858332ce16c2362c6322ccf99db7f81 100644 (file)
@@ -1220,7 +1220,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
index d4e2052a788e56b4ad10f7cdaa8059bc254766e1..c83ddd3972f340b194ca8644d55b8381f0a34af9 100644 (file)
@@ -1224,7 +1224,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
index 65e22aa902f46a2b82c2d9c9cd114bd16476312d..a51ca49cc28445e108838098bd1fb1dad214cb90 100644 (file)
@@ -1220,7 +1220,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
index c223e6439163bebb5df85950cc4a5e93bd5114d7..833e81a5f3260f79c875d4af8aea4da768a5f48e 100644 (file)
@@ -1224,7 +1224,14 @@ aside #likes a:hover{
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
index 1df0d56bc750f55404977e50d0e3a69368ac9605..79c5fb1cbed41244283e0bb15d98b83180859aea 100644 (file)
@@ -1232,7 +1232,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
index 856a5d08a8c3930bc9f9250c320c7f89a99939f0..c7cb1586d0349a36d0d4323468ffc7d188e103cc 100644 (file)
@@ -1230,7 +1230,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;          
        }
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
diff --git a/view/theme/diabook/icons/scroll_bottom.png b/view/theme/diabook/icons/scroll_bottom.png
new file mode 100644 (file)
index 0000000..eba301b
Binary files /dev/null and b/view/theme/diabook/icons/scroll_bottom.png differ
index e0ffa4f7b06bee2eec4a3622da1f8ddd7fbe84db..ce27400f64a95c4c836ef9499ba28db6479d0181 100644 (file)
 </nav>
 
 
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 
index abd10476a6cfcd6121a2beed1636361d144f11e5..f8dced3e69492e24f526c8fc0a75648128556a53 100644 (file)
@@ -1195,7 +1195,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;  
        }
 #login-submit-wrapper{
-  margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 /* widget */
 .widget {
index 23f8ac465a4b7b3922d16605fc14ec8cfb2039da..9150ea8cf807648529563d5f9657b8303f9e76ef 100644 (file)
@@ -1198,7 +1198,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;  
        }
 #login-submit-wrapper{
-  margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 /* widget */
 .widget {
index 269015d0a3e5fa83e90d36d2353129f044f01192..073e270ef9de4803f34b7d2c9945fcd7233ddcfc 100755 (executable)
@@ -356,25 +356,48 @@ $(document).ready(function() {
             $(this).attr("src",newString+"?"+wmode+"&"+oldString);
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
+       
     });
-    
-    $("a[href=#top]").click(function() {
-                       $("html, body").animate({scrollTop:0}, "slow");
-                       return false;
-               });
       
-
 });
 
 function yt_iframe() {
 
-
        $("iframe").load(function() { 
        var ifr_src = $(this).contents().find("body iframe").attr("src");
        $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
     });
 
        };
+
+function scrolldown(){
+                       $("html, body").animate({scrollTop:$(document).height()}, "slow");
+                       return false;
+               };
+               
+function scrolltop(){
+                       $("html, body").animate({scrollTop:0}, "slow");
+                       return false;
+               };
+               
+$(window).scroll(function () { 
+               
+                               
+               var scrollInfo = $(window).scrollTop();      
+               
+               if (scrollInfo <= "900"){
+      $("a#top").attr("id","down");
+      $("a#down").attr("onclick","scrolldown()");
+               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
+               } 
+                   
+      if (scrollInfo > "900"){
+      $("a#down").attr("id","top");
+      $("a#top").attr("onclick","scrolltop()");
+               $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
+               }
+               
+    });
   
  </script>';
  
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/duepuntozero/editicons.png b/view/theme/duepuntozero/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/duepuntozero/editicons.png differ
index c30e643ce49bc4b53e0c6135f3e8553f697905d4..8e131ad201fe956568a64921a7d0166f0a7a4108 100644 (file)
@@ -2937,6 +2937,79 @@ aside input[type='text'] {
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+[class^="comment-edit-bb"] {
+       list-style: none;
+       display: none;
+       margin: 0px 0 -5px 60px;
+       width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+       display: inline-block;
+       margin: 10px 10px 0 0;
+       visibility: none;
+}
+[class^="comment-edit-bb-end"] {
+       clear: both;
+}
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.editicon:hover {
+       border: 0;
+}
+.boldbb {
+       background-position: 0px 0px;
+}
+.boldbb:hover {
+       background-position: -22px 0px;
+}
+.italicbb {
+       background-position: 0px -22px;
+}
+.italicbb:hover {
+       background-position: -22px -22px;
+}
+.underlinebb {
+       background-position: 0px -44px;
+}
+.underlinebb:hover {
+       background-position: -22px -44px;
+}
+.quotebb {
+       background-position: 0px -66px;
+}
+.quotebb:hover {
+       background-position: -22px -66px;
+}
+.codebb {
+       background-position: 0px -88px;
+}
+.codebb:hover {
+       background-position: -22px -88px;
+}
+.imagebb {
+       background-position: -44px 0px;
+}
+.imagebb:hover {
+       background-position: -66px 0px;
+}
+.urlbb {
+       background-position: -44px -22px;
+}
+.urlbb:hover {
+       background-position: -66px -22px;
+}
+.videobb {
+       background-position: -44px -44px;
+}
+.videobb:hover {
+       background-position: -66px -44px;
+}
 
 .attachtype {
        display: block; width: 20px; height: 23px;
index 7b42088e1cc17762b7a12e6e90a5432ef43af527..8c7e6c6072b02c568cea12afd63f3bb4c762a2c8 100644 (file)
@@ -4,6 +4,41 @@ $a->theme_info = array();
 function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/greenzero/comment_item.tpl b/view/theme/greenzero/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/greenzero/editicons.png b/view/theme/greenzero/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/greenzero/editicons.png differ
index c802024754918ab7a9f795ed83a36e4af05635b3..af69b150a32d9c2ff5df225058b6a320cfd617f8 100644 (file)
@@ -6,6 +6,41 @@ $a->theme_info = array(
 function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/purplezero/comment_item.tpl b/view/theme/purplezero/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/purplezero/editicons.png b/view/theme/purplezero/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/purplezero/editicons.png differ
index b9613027c5f6201374f8579db22d34b4d5595db2..9b483db6253a8335ca56acd2adbc34cbaf6cd752 100644 (file)
@@ -6,6 +6,41 @@ $a->theme_info = array(
 function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
new file mode 100644 (file)
index 0000000..fc13fa6
--- /dev/null
@@ -0,0 +1,39 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+<script>
+       // start calendar from yesterday
+       var yesterday= new Date()
+       yesterday.setDate(yesterday.getDate()-1)
+       
+       function showEvent(eventid) {
+               $.get(
+                       '$baseurl/events/?id='+eventid,
+                       function(data){
+                               $.fancybox(data);
+                       }
+               );                      
+       }
+       $(document).ready(function() {
+               $('#events-reminder').fullCalendar({
+                       firstDay: yesterday.getDay(),
+                       year: yesterday.getFullYear(),
+                       month: yesterday.getMonth(),
+                       date: yesterday.getDate(),
+                       events: '$baseurl/events/json/',
+                       header: {
+                               left: '',
+                               center: '',
+                               right: ''
+                       },                      
+                       timeFormat: 'H(:mm)',
+                       defaultView: 'basicWeek',
+                       height: 50,
+                       eventClick: function(calEvent, jsEvent, view) {
+                               showEvent(calEvent.id);
+                       }
+               });
+       });
+</script>
+<div id="events-reminder"></div>
+<br>
diff --git a/view/theme/slack-NS/comment_item.tpl b/view/theme/slack-NS/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/slack-NS/editicons.png b/view/theme/slack-NS/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/slack-NS/editicons.png differ
index a8934d03b20435a60bc0205062e10068122bcb65..68d579211bddc626cc9a4fd31553d3273a1fdba8 100644 (file)
@@ -6,6 +6,41 @@ $a->theme_info = array(
 function slack_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/slackr/comment_item.tpl b/view/theme/slackr/comment_item.tpl
new file mode 100755 (executable)
index 0000000..84b9597
--- /dev/null
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               </div>
+                               <div class="comment-edit-photo-end"></div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;"
+                                               onclick="insertFormatting('$comment','video', $id);"></a></li>
+                               </ul>   
+                               <div class="comment-edit-bb-end"></div>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>
diff --git a/view/theme/slackr/editicons.png b/view/theme/slackr/editicons.png
new file mode 100644 (file)
index 0000000..171a408
Binary files /dev/null and b/view/theme/slackr/editicons.png differ
index 78f5d40f05b59a33b4b08fc6451939a8fe65189c..a5520fce5f03f3320248676d9aacefffc76ad5b3 100644 (file)
@@ -6,6 +6,41 @@ $a->theme_info = array(
 function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+function insertFormatting(comment,BBcode,id) {
+       
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == comment) {
+                       tmpStr = "";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+                                                               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });