Merge https://github.com/friendica/friendica into pull

diff --git a/boot.php b/boot.php
index 3f821ec55f599aa539b85080bde7ffa30c964e57..8b25dff4624b48e63128b9d895441b201fb15d40 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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,
+               ));
        }
 }
 

diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl
new file mode 100644 (file)
index 0000000..c0422c1
--- /dev/null
+++ b/view/birthdays_reminder.tpl
@@ -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 }}
+

diff --git a/view/event_head.tpl b/view/event_head.tpl
index 97201e722988adb98e11eaa09d6403dd507439d6..471748b97ab7db668f2c9d83c4d60f315c8034bb 100644 (file)
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -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',
@@ -13,12 +22,7 @@
                        },                      
                        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) {
@@ -55,70 +59,81 @@
                        }
                        
                })
+               
+               // 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
+++ b/view/events_reminder.tpl
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/darkzero-NS/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 6c1aa7f125296f4681f916b53d00eae270b0be3d..bdf4b8ceff41a44992ab5e0e8c37fbfd60034f36 100644 (file)
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/darkzero/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index bbba3ef740ccea9dbe5aae46fb48b21e18d6d9ee..dc0da0b167df1bb41e04a597ccf8424f39d1f133 100644 (file)
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -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(); });

diff --git a/view/theme/diabook/diabook-dark/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png
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

diff --git a/view/theme/diabook/diabook-dark/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png
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

diff --git a/view/theme/diabook/diabook-dark/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png
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

diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index d236297b77c8b9d726484027c4a69ad9cfb08d74..7ddedb320b04aab59cce2ad57962c1d6a5b122ac 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: #3465a4;
+  color: #88a9d2;
 }
 .tool a:hover {
   text-decoration: none;

diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 8824d18fe3c5fade99f267acf70a7075785dfb95..b052b77ff448453ef50a09895d0424a18b7cef4b 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -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 {

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

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index e0ffa4f7b06bee2eec4a3622da1f8ddd7fbe84db..ce27400f64a95c4c836ef9499ba28db6479d0181 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
 </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>
 

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 269015d0a3e5fa83e90d36d2353129f044f01192..073e270ef9de4803f34b7d2c9945fcd7233ddcfc 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c30e643ce49bc4b53e0c6135f3e8553f697905d4..8e131ad201fe956568a64921a7d0166f0a7a4108 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -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;

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 7b42088e1cc17762b7a12e6e90a5432ef43af527..8c7e6c6072b02c568cea12afd63f3bb4c762a2c8 100644 (file)
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/greenzero/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index c802024754918ab7a9f795ed83a36e4af05635b3..af69b150a32d9c2ff5df225058b6a320cfd617f8 100644 (file)
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/purplezero/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index b9613027c5f6201374f8579db22d34b4d5595db2..9b483db6253a8335ca56acd2adbc34cbaf6cd752 100644 (file)
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -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
+++ b/view/theme/quattro/birthdays_reminder.tpl
@@ -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
+++ b/view/theme/quattro/events_reminder.tpl
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/slack-NS/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index a8934d03b20435a60bc0205062e10068122bcb65..68d579211bddc626cc9a4fd31553d3273a1fdba8 100644 (file)
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -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..375aff8
--- /dev/null
+++ b/view/theme/slackr/comment_item.tpl
@@ -0,0 +1,59 @@
+               <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 }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ 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

diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 78f5d40f05b59a33b4b08fc6451939a8fe65189c..a5520fce5f03f3320248676d9aacefffc76ad5b3 100644 (file)
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -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(); });