]> git.mxchange.org Git - friendica.git/commitdiff
Cleaning up, actual changes are in the next commits
authorHypolite Petovan <mrpetovan@gmail.com>
Sat, 7 Jan 2017 14:49:13 +0000 (01:49 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Sat, 7 Jan 2017 15:03:11 +0000 (02:03 +1100)
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments

28 files changed:
mod/photos.php
view/templates/comment_item.tpl
view/templates/head.tpl
view/templates/jot.tpl
view/templates/moderated_comment.tpl
view/theme/duepuntozero/templates/comment_item.tpl
view/theme/duepuntozero/templates/moderated_comment.tpl
view/theme/duepuntozero/theme.php
view/theme/frio/js/filebrowser.js
view/theme/frio/js/textedit.js
view/theme/frio/templates/comment_item.tpl
view/theme/frio/templates/jot.tpl
view/theme/frost-mobile/js/theme.js
view/theme/frost-mobile/templates/comment_item.tpl
view/theme/frost-mobile/templates/head.tpl
view/theme/frost-mobile/templates/jot.tpl
view/theme/frost-mobile/templates/moderated_comment.tpl
view/theme/frost/js/theme.js
view/theme/frost/templates/comment_item.tpl
view/theme/frost/templates/head.tpl
view/theme/frost/templates/jot.tpl
view/theme/frost/templates/moderated_comment.tpl
view/theme/quattro/templates/comment_item.tpl
view/theme/smoothly/templates/bottom.tpl
view/theme/smoothly/templates/jot.tpl
view/theme/smoothly/theme.php
view/theme/vier/templates/comment_item.tpl
view/theme/vier/theme.php

index e026944423491748732f7a02a25e4c8c376513bf..3b927ed84f835ae3ca390e0dd34613a475db3c0f 100644 (file)
@@ -1307,7 +1307,7 @@ function photos_content(&$a) {
 
        }
 
-       /** 
+       /**
         * Display one photo
         */
 
@@ -1583,7 +1583,6 @@ function photos_content(&$a) {
                                        '$id' => $link_item['id'],
                                        '$likethis' => t("I like this \x28toggle\x29"),
                                        '$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
-                                       '$share' => t('Share'),
                                        '$wait' => t('Please wait'),
                                        '$return_path' => $a->query_string,
                                ));
index fa360df3a810a0fd17ab68a465965a21facd1577..a0fd805bcc2ac11a664a8ce5397e286170b9529f 100644 (file)
@@ -22,7 +22,7 @@
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc|escape:'html'}}">{{$qc}}</option>                          
+                                       <option value="{{$qc|escape:'html'}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
index 0f1ec837f89b953484dfb0a2d80f3314fb064b8b..0f22362620a202f8f48db9da2553ab9c5d3c2d85 100644 (file)
        For the relevant js part look at function loadContent() in main.js. *}}
        {{if $infinite_scroll}}
        var infinite_scroll = {
-                               'pageno'        : {{$infinite_scroll.pageno}},
-                               'reload_uri'    : "{{$infinite_scroll.reload_uri}}"
-                               }
+               "pageno"        : {{$infinite_scroll.pageno}},
+               "reload_uri"    : "{{$infinite_scroll.reload_uri}}"
+       }
        {{/if}}
 
        function confirmDelete() { return confirm("{{$delitem}}"); }
        function commentExpand(id) {
-               $("#comment-edit-text-" + id).value = '';
+               $("#comment-edit-text-" + id).value = "";
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                $("#comment-edit-text-" + id).focus();
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
                var ins = $(obj).html();
-               ins = ins.replace('&lt;','<');
-               ins = ins.replace('&gt;','>');
-               ins = ins.replace('&amp;','&');
-               ins = ins.replace('&quot;','"');
+               ins = ins.replace("&lt;","<");
+               ins = ins.replace("&gt;",">");
+               ins = ins.replace("&amp;","&");
+               ins = ins.replace("&quot;",""");
                $("#comment-edit-text-" + id).val(tmpStr + ins);
        }
 
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
                var ins = $(obj).val();
-               ins = ins.replace('&lt;','<');
-               ins = ins.replace('&gt;','>');
-               ins = ins.replace('&amp;','&');
-               ins = ins.replace('&quot;','"');
+               ins = ins.replace("&lt;","<");
+               ins = ins.replace("&gt;",">");
+               ins = ins.replace("&amp;","&");
+               ins = ins.replace("&quot;",""");
                $("#comment-edit-text-" + id).val(tmpStr + ins);
-               $(obj).val('');
+               $(obj).val("");
        }
 
        window.showMore = "{{$showmore}}";
        window.showFewer = "{{$showfewer}}";
 
        function showHideCommentBox(id) {
-               if( $('#comment-edit-form-' + id).is(':visible')) {
-                       $('#comment-edit-form-' + id).hide();
-               }
-               else {
-                       $('#comment-edit-form-' + id).show();
+               if ($("#comment-edit-form-" + id).is(":visible")) {
+                       $("#comment-edit-form-" + id).hide();
+               } else {
+                       $("#comment-edit-form-" + id).show();
                }
        }
 
index dfc6b2710415fb94b44585e597ef4cedf053ff37..a3600c3ff5fb1cc9d6c26f6c8b976a0beecc6209 100644 (file)
 
        <div id="profile-upload-wrapper" style="display: {{$visitor}};" >
                <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload|escape:'html'}}"></a></div>
-       </div> 
+       </div>
        <div id="profile-attach-wrapper" style="display: {{$visitor}};" >
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach|escape:'html'}}"></a></div>
-       </div> 
+       </div>
 
        <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
                <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
                <a id="profile-video" class="icon video" title="{{$video|escape:'html'}}" onclick="jotVideoURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
                <a id="profile-audio" class="icon audio" title="{{$audio|escape:'html'}}" onclick="jotAudioURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-location-wrapper" style="display: {{$visitor}};" >
                <a id="profile-location" class="icon globe" title="{{$setloc|escape:'html'}}" onclick="jotGetLocation();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <a id="profile-nolocation" class="icon noglobe" title="{{$noloc|escape:'html'}}" onclick="jotClearLocation();return false;"></a>
-       </div> 
+       </div>
 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
                <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset|escape:'html'}}" ></a>{{$bang}}
@@ -70,8 +70,8 @@
 
        <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
                <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" />
-       </div> 
-       
+       </div>
+
        <div id="jot-preview-content" style="display:none;"></div>
 
        <div style="display: none;">
index 6e5eb22e7b3135e117f114947fca2be79d9d5d86..a8f1c6b1ebea347fbe6949d5463dbd941a60dd91 100644 (file)
@@ -8,7 +8,7 @@
                                <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}}" >
+                               <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
                                        <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle|escape:'html'}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle|escape:'html'}}" title="{{$mytitle|escape:'html'}}" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
@@ -23,7 +23,7 @@
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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|escape:'html'}}" />
                                        <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>
index 1bb9dc6663d8f0759c9fb458c907b8b5d2a0bc43..9452c01a790cb38b43747a8d95736a2ac42c8bce 100644 (file)
@@ -13,7 +13,7 @@
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-                               <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+                               <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>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
-                               </ul>   
+                               </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(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>                       
                                {{if $qcomment}}
-                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc}}">{{$qc}}</option>                                
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
@@ -63,5 +63,4 @@
 
                                <div class="comment-edit-end"></div>
                        </form>
-
                </div>
index 21044eb912655717c96b5042ada5cbad22c0d9f1..563abd452775825ee515f1124aaa0bbee1a9669f 100644 (file)
@@ -8,7 +8,7 @@
                                <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}}" >
+                               <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>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                               </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>                      
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
index 50d57f91e5759041f463284537ddcfcc1495ad9d..347e542e1c253b57f4c9b664dcee636bb8719f1a 100644 (file)
@@ -54,61 +54,54 @@ function insertFormatting(comment,BBcode,id) {
 }
 
 function cmtBbOpen(comment, id) {
-       if($(comment).hasClass('comment-edit-text-full')) {
+       if ($(comment).hasClass('comment-edit-text-full')) {
                $(".comment-edit-bb-" + id).show();
                return true;
        }
        return false;
 }
 function cmtBbClose(comment, id) {
-//     if($(comment).hasClass('comment-edit-text-empty')) {
-//             $(".comment-edit-bb-" + id).hide();
-//             return true;
-//     }
        return false;
 }
 $(document).ready(function() {
 
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+       $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
-$('.group-edit-icon').hover(
-       function() {
-               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.group-edit-icon').hover(
+               function() {
+                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.sidebar-group-element').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+       $('.sidebar-group-element').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
        );
 
 
-$('.savedsearchdrop').hover(
-       function() {
-               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.savedsearchdrop').hover(
+               function() {
+                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.savedsearchterm').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+       $('.savedsearchterm').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
        );
-
 });
-
-
 </script>
 EOT;
 }
index 768db3a705653a33853892bbf9c5074a72387b8e..db5a125a0b595b4f2bb376b732291b2be978e390 100644 (file)
 \r
 /*\r
  * IMPORTANT\r
- * \r
- *  This is a modified version to work with \r
+ *\r
+ *  This is a modified version to work with\r
  *  the frio theme.and bootstrap modals\r
- *  \r
+ *\r
  *  The origninal file is under:\r
  *  js/filebrowser.js\r
- * \r
+ *\r
  */\r
 \r
 \r
@@ -93,18 +93,18 @@ var FileBrowser = {
                        $(".error").addClass("hidden");\r
                });\r
 \r
-               $(".folders a, .path a").on("click", function(e){\r
+               $(".folders a, .path a").on("click", function(e) {\r
                        e.preventDefault();\r
                        var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
 \r
                        // load new content to fbrowser window\r
-                       $(".fbrowser").load(url,function(){\r
+                       $(".fbrowser").load(url,function() {\r
                                $(function() {FileBrowser.init(nickname, type, hash);});\r
                        });\r
                });\r
 \r
                //embed on click\r
-               $(".photo-album-photo-link").on('click', function(e){\r
+               $(".photo-album-photo-link").on('click', function(e) {\r
                        e.preventDefault();\r
 \r
                        var embed = "";\r
@@ -142,11 +142,6 @@ var FileBrowser = {
                        $('#modal').modal('hide');\r
                        // update autosize for this textarea\r
                        autosize.update($(".text-autosize"));\r
-//                     if (id!=="") {\r
-//                             commentExpand(FileBrowser.id);\r
-//                             //$("#comment-edit-text-558").empty();\r
-//                     };\r
-\r
                });\r
 \r
                if ($("#upload-image").length)\r
@@ -168,7 +163,7 @@ var FileBrowser = {
 \r
                                                var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"\r
                                                // load new content to fbrowser window\r
-                                               $(".fbrowser").load(url,function(){\r
+                                               $(".fbrowser").load(url,function() {\r
                                                        $(function() {FileBrowser.init(nickname, type, hash);});\r
                                                });\r
                                        }\r
@@ -193,7 +188,7 @@ var FileBrowser = {
 \r
                                                var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"\r
                                                // load new content to fbrowser window\r
-                                               $(".fbrowser").load(url,function(){\r
+                                               $(".fbrowser").load(url,function() {\r
                                                        $(function() {FileBrowser.init(nickname, type, hash);});\r
                                                });\r
                                        }\r
index a3ffdc4a34c4bd11865ae0d36eac1ef5b95b64d7..2423171ec4d72c26eb8d40f9f0a94bee871161e3 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
  * @brief The file contains functions for text editing and commenting
  */
 
@@ -93,7 +93,7 @@ function commentOpenUI(obj, id) {
                        $("#comment-edit-text-" + id).attr('tabindex','9');
                        $("#comment-edit-submit-" + id).attr('tabindex','10');
                        $("#comment-edit-submit-wrapper-" + id).show();
-                       // initiale autosize for this comment
+                       // initialize autosize for this comment
                        autosize($("#comment-edit-text-" + id + ".text-autosize"));
                }
        };
index 50b9ff0b0b124149476c94fe9ce4f73a084f77e6..c7d225e5bea4fae56bd10fc53c30de0d528515d5 100644 (file)
                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-               <!--<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>-->
                <div class="bb form-group">
                        <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});">{{$comment}}</textarea>
                </div>
                {{if $qcomment}}
-                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                        <option value=""></option>
                {{foreach $qcomment as $qc}}
                        <option value="{{$qc}}">{{$qc}}</option>
index 1c777a8e9899a5344bb1352b54ce3d07eacc5c6b..bcf00213233d3fe9213b47ee7587fa4e7cb4261b 100644 (file)
@@ -74,7 +74,7 @@
                                                <li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}"><i class="fa fa-film"></i></a></li>
                                                <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}"><i class="fa fa-music"></i></a></li>
                                                <li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}"><i class="fa fa-map-marker"></i></a></li>
-                                               <!-- TODO: waiting for a better placement 
+                                               <!-- TODO: waiting for a better placement
                                                <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
                                                -->
 
@@ -82,7 +82,7 @@
                                                <li id="character-counter" class="grey jothidden text-info pull-right"></li>
                                                <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
                                                        <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-                                               </div> 
+                                               </div>
                                                <div id="profile-jot-plugin-wrapper">
                                                        {{$jotplugins}}
                                                </div>
index 5f7997b086d0dd8090c88cc999011982d93c7438..fc42d9208572f09c5b03fed182d8fa65f57a0a28 100644 (file)
@@ -4,47 +4,8 @@ $(document).ready(function() {
        $("#profile-jot-text").focus(enableOnUser);
        $("#profile-jot-text").click(enableOnUser);
 
-/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
-
-       /*$('.group-edit-icon').hover(
-               function() {
-                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-               function() {
-                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-       );
-
-       $('.sidebar-group-element').hover(
-               function() {
-                       id = $(this).attr('id');
-                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-               function() {
-                       id = $(this).attr('id');
-                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-       );
-
-
-       $('.savedsearchdrop').hover(
-               function() {
-                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-               function() {
-                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-       );
-
-       $('.savedsearchterm').hover(
-               function() {
-                       id = $(this).attr('id');
-                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-               function() {
-                       id = $(this).attr('id');
-                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-       );*/
-
-
        $('#event-share-checkbox').change(function() {
-
-               if ($('#event-share-checkbox').is(':checked')) { 
+               if ($('#event-share-checkbox').is(':checked')) {
                        $('#acl-wrapper').show();
                }
                else {
@@ -52,7 +13,6 @@ $(document).ready(function() {
                }
        }).trigger('change');
 
-
        $(".popupbox").click(function () {
                var parent = $( $(this).attr('href') ).parent();
                if (parent.css('display') == 'none') {
@@ -65,7 +25,7 @@ $(document).ready(function() {
 
 
 
-       if(typeof window.AjaxUpload != "undefined") {
+       if (typeof window.AjaxUpload != "undefined") {
                var uploader = new window.AjaxUpload(
                        window.imageUploadButton,
                        { action: 'wall_upload/'+window.nickname+'?nomce=1',
@@ -74,11 +34,11 @@ $(document).ready(function() {
                                onComplete: function(file,response) {
                                        addeditortext(window.jotId, response);
                                        $('#profile-rotator').hide();
-                               }                                
+                               }
                        }
                );
 
-               if($('#wall-file-upload').length) {
+               if ($('#wall-file-upload').length) {
                        var file_uploader = new window.AjaxUpload(
                                'wall-file-upload',
                                { action: 'wall_attach/'+window.nickname+'?nomce=1',
@@ -87,14 +47,14 @@ $(document).ready(function() {
                                        onComplete: function(file,response) {
                                                addeditortext(window.jotId, response);
                                                $('#profile-rotator').hide();
-                                       }                                
+                                       }
                                }
                        );
                }
        }
 
 
-       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
+       if (typeof window.aclInit !="undefined" && typeof acl=="undefined") {
                acl = new ACL(
                        baseurl+"/acl",
                        [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@@ -111,13 +71,13 @@ $(document).ready(function() {
                        $("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
 
 
-                       $("#contacts-search").keyup(function(event){
-                               if(event.keyCode == 13){
+                       $("#contacts-search").keyup(function(event) {
+                               if (event.keyCode == 13) {
                                        $("#contacts-search").click();
                                }
                        });
-                       $(".autocomplete-w1 .selected").keyup(function(event){
-                               if(event.keyCode == 13){
+                       $(".autocomplete-w1 .selected").keyup(function(event) {
+                               if (event.keyCode == 13) {
                                        $("#contacts-search").click();
                                }
                        });
@@ -129,16 +89,7 @@ $(document).ready(function() {
                        break;
        }
 
-
-/*     if(window.autoCompleteType == "display-head") {
-               //$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-               // make auto-complete work in more places
-               //$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-               $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-       }*/
-
-
-       if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
+       if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
                $('#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() {
@@ -146,7 +97,7 @@ $(document).ready(function() {
                                $('#jot-perms-icon').removeClass('unlock').addClass('lock');
                                $('#jot-public').hide();
                        });
-                       if(selstr == null) { 
+                       if (selstr == null) {
                                $('#jot-perms-icon').removeClass('lock').addClass('unlock');
                                $('#jot-public').show();
                        }
@@ -154,23 +105,23 @@ $(document).ready(function() {
                }).trigger('change');
        }
 
-       if(window.aclType == "event_head") {
+       if (window.aclType == "event_head") {
                $('#events-calendar').fullCalendar({
                        events: baseurl + window.eventModuleUrl +'/json/',
                        header: {
                                left: 'prev,next today',
                                center: 'title',
                                right: 'month,agendaWeek,agendaDay'
-                       },                      
+                       },
                        timeFormat: 'H(:mm)',
                        eventClick: function(calEvent, jsEvent, view) {
                                showEvent(calEvent.id);
                        },
-                       
+
                        eventRender: function(event, element, view) {
                                //console.log(view.name);
                                if (event.item['author-name']==null) return;
-                               switch(view.name){
+                               switch(view.name) {
                                        case "month":
                                        element.find(".fc-title").html(
                                                "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
@@ -199,9 +150,9 @@ $(document).ready(function() {
                                        break;
                                }
                        }
-                       
+
                });
-               
+
                // center on date
                var args=location.href.replace(baseurl,"").split("/");
                if (args.length>=5 && window.eventModeParams == 2) {
@@ -209,18 +160,18 @@ $(document).ready(function() {
                } else if (args.length>=4 && window.eventModeParams == 1) {
                        $("#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]);
-       }       
+       }
 
 });
 
 // update pending count //
-$(function(){
+$(function() {
 
-       $("nav").bind('nav-update',  function(e,data){
+       $("nav").bind('nav-update',  function(e,data) {
                var elm = $('#pending-update');
                var register = $(data).find('register').text();
                if (register=="0") { register=""; elm.hide();} else { elm.show(); }
@@ -231,7 +182,7 @@ $(function(){
 
 
 function homeRedirect() {
-       $('html').fadeOut('slow', function(){
+       $('html').fadeOut('slow', function() {
                window.location = baseurl + "/login";
        });
 }
@@ -265,12 +216,6 @@ function initCrop() {
 
 
 function showEvent(eventid) {
-/*     $.get(
-               baseurl + window.eventModuleUrl + '/?id=' + eventid,
-               function(data){
-                       $.colorbox({html:data});
-               }
-       );*/                    
 }
 
 
@@ -284,18 +229,13 @@ var textlen = 0;
 var plaintext = 'none';//window.editSelect;
 //var ispublic = window.isPublic;
 
-function initEditor(cb){
-       if (editor==false){
-//             $("#profile-jot-text-loading").show();
-               if(plaintext == 'none') {
-//                     $("#profile-jot-text-loading").hide();
+function initEditor(cb) {
+       if (editor==false) {
+               if (plaintext == 'none') {
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
                        $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
                        editor = true;
-/*                     $("a#jot-perms-icon").colorbox({
-                               'inline' : true,
-                               'transition' : 'elastic'
-                       });*/
+
                        $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
                                var parent = $("#profile-jot-acl-wrapper").parent();
                                if (parent.css('display') == 'none') {
@@ -303,181 +243,49 @@ function initEditor(cb){
                                } else {
                                        parent.hide();
                                }
-//                             $("#profile-jot-acl-wrapper").parent().toggle();
+
                                return false;
                        });
                        $(".jothidden").show();
-                       if (typeof cb!="undefined") cb();
-                       return;
-               }       
-/*             tinyMCE.init({
-                       theme : "advanced",
-                       mode : "specific_textareas",
-                       editor_selector: window.editSelect,
-                       auto_focus: "profile-jot-text",
-                       plugins : "bbcode,paste,autoresize, inlinepopups",
-                       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 : 'div',
-                       convert_urls: false,
-                       content_css: "$baseurl/view/custom_tinymce.css",
-                       theme_advanced_path : false,
-                       file_browser_callback : "fcFileBrowser",
-                       setup : function(ed) {
-                               cPopup = null;
-                               ed.onKeyDown.add(function(ed,e) {
-                                       if(cPopup !== null)
-                                               cPopup.onkey(e);
-                               });
-
-                               ed.onKeyUp.add(function(ed, e) {
-                                       var txt = tinyMCE.activeEditor.getContent();
-                                       match = txt.match(/@([^ \n]+)$/);
-                                       if(match!==null) {
-                                               if(cPopup === null) {
-                                                       cPopup = new ACPopup(this,baseurl+"/acl");
-                                               }
-                                               if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-                                               if(! cPopup.ready) cPopup = null;
-                                       }
-                                       else {
-                                               if(cPopup !== null) { cPopup.close(); cPopup = null; }
-                                       }
-
-                                       textlen = txt.length;
-                                       if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-                                               $('#profile-jot-desc').html(ispublic);
-                                       }
-                                       else {
-                                               $('#profile-jot-desc').html('&nbsp;');
-                                       }        
-
-                                //Character count
-
-                                       if(textlen <= 140) {
-                                               $('#character-counter').removeClass('red');
-                                               $('#character-counter').removeClass('orange');
-                                               $('#character-counter').addClass('grey');
-                                       }
-                                       if((textlen > 140) && (textlen <= 420)) {
-                                               $('#character-counter').removeClass('grey');
-                                               $('#character-counter').removeClass('red');
-                                               $('#character-counter').addClass('orange');
-                                       }
-                                       if(textlen > 420) {
-                                               $('#character-counter').removeClass('grey');
-                                               $('#character-counter').removeClass('orange');
-                                               $('#character-counter').addClass('red');
-                                       }
-                                       $('#character-counter').text(textlen);
-                               });
-
-                               ed.onInit.add(function(ed) {
-                                       ed.pasteAsPlainText = true;
-                                       $("#profile-jot-text-loading").hide();
-                                       $(".jothidden").show();
-                                       if (typeof cb!="undefined") cb();
-                               });
-
+                       if (typeof cb!="undefined") {
+                               cb();
                        }
-               });
-               editor = true;
-               // setup acl popup
-               $("a#jot-perms-icon").colorbox({
-                       'inline' : true,
-                       'transition' : 'elastic'
-               }); */
+                       return;
+               }
        } else {
                if (typeof cb!="undefined") cb();
        }
 }
 
-function enableOnUser(){
-       if (editor) return;
+function enableOnUser() {
+       if (editor) {
+               return;
+       }
        $(this).val("");
        initEditor();
 }
 
-/*function wallInitEditor() {
-       var plaintext = window.editSelect;
-
-       if(plaintext != 'none') {
-               tinyMCE.init({
-                       theme : "advanced",
-                       mode : "specific_textareas",
-                       editor_selector: /(profile-jot-text|prvmail-text)/,
-                       plugins : "bbcode,paste",
-                       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-                       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 : 'div',
-                       convert_urls: false,
-                       content_css: baseurl + "/view/custom_tinymce.css",
-                                //Character count
-                       theme_advanced_path : false,
-                       setup : function(ed) {
-                               ed.onInit.add(function(ed) {
-                                       ed.pasteAsPlainText = true;
-                                       var editorId = ed.editorId;
-                                       var textarea = $('#'+editorId);
-                                       if (typeof(textarea.attr('tabindex')) != "undefined") {
-                                               $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-                                               textarea.attr('tabindex', null);
-                                       }
-                               });
-                       }
-               });
-       }
-       else
-               $("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}*/
-
-
-
 /*
  * Jot
  */
 
 function addeditortext(textElem, data) {
-       if(window.editSelect == 'none') {
+       if (window.editSelect == 'none') {
                var currentText = $(textElem).val();
                $(textElem).val(currentText + data);
        }
-/*     else
-               tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
 }
 
 function jotVideoURL() {
        reply = prompt(window.vidURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
        }
 }
 
 function jotAudioURL() {
        reply = prompt(window.audURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
        }
 }
@@ -485,7 +293,7 @@ function jotAudioURL() {
 
 function jotGetLocation() {
        reply = prompt(window.whereAreU, $('#jot-location').val());
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                $('#jot-location').val(reply);
        }
 }
@@ -496,7 +304,7 @@ function jotShare(id) {
        $('#like-rotator-' + id).show();
        $.get('share/' + id, function(data) {
                if (!editor) $("#profile-jot-text").val("");
-               initEditor(function(){
+               initEditor(function() {
                        addeditortext("#profile-jot-text", data);
                        $('#like-rotator-' + id).hide();
                        $(window).scrollTop(0);
@@ -507,7 +315,7 @@ function jotShare(id) {
 
 function jotGetLink() {
        reply = prompt(window.linkURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                reply = bin2hex(reply);
                $('#profile-rotator').show();
                $.get('parse_url?binurl=' + reply, function(data) {
@@ -517,35 +325,12 @@ function jotGetLink() {
        }
 }
 
-/*function linkdropper(event) {
-       var linkFound = event.dataTransfer.types.contains("text/uri-list");
-       if(linkFound)
-               event.preventDefault();
-}
-
-function linkdrop(event) {
-       var reply = event.dataTransfer.getData("text/uri-list");
-       event.target.textContent = reply;
-       event.preventDefault();
-       if(reply && reply.length) {
-               reply = bin2hex(reply);
-               $('#profile-rotator').show();
-               $.get('parse_url?binurl=' + reply, function(data) {
-                       //if (!editor) $("#profile-jot-text").val("");
-                       //initEditor(function(){
-                       addeditortext(window.jotId, data);
-                       $('#profile-rotator').hide();
-                       //});
-               });
-       }
-}*/
-
 function jotClearLocation() {
        $('#jot-coord').val('');
        $('#profile-nolocation-wrapper').hide();
 }
 
-if(typeof window.geoTag === 'function') window.geoTag();
+if (typeof window.geoTag === 'function') window.geoTag();
 
 
 
@@ -555,35 +340,17 @@ if(typeof window.geoTag === 'function') window.geoTag();
 
 function confirmDelete() { return confirm(window.delItem); }
 
-/*function deleteCheckedItems() {
-       var checkedstr = '';
-
-       $('.item-select').each( function() {
-               if($(this).is(':checked')) {
-                       if(checkedstr.length != 0) {
-                               checkedstr = checkedstr + ',' + $(this).val();
-                       }
-                       else {
-                               checkedstr = $(this).val();
-                       }
-               }       
-       });
-       $.post('item', { dropitems: checkedstr }, function(data) {
-               window.location.reload();
-       });
-}*/
-
 function itemTag(id) {
        reply = prompt(window.term);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                reply = reply.replace('#','');
-               if(reply.length) {
+               if (reply.length) {
 
                        commentBusy = true;
                        $('body').css('cursor', 'wait');
 
                        $.get('tagger/' + id + '?term=' + reply, NavUpdate);
-                       /*if(timer) clearTimeout(timer);
+                       /*if (timer) clearTimeout(timer);
                        timer = setTimeout(NavUpdate,3000);*/
                        liking = 1;
                }
@@ -591,61 +358,23 @@ function itemTag(id) {
 }
 
 function itemFiler(id) {
-       
-       $.get('filer/', function(data){
+       $.get('filer/', function(data) {
 
                var promptText = $('#id_term_label', data).text();
 
                reply = prompt(promptText);
-               if(reply && reply.length) {
+               if (reply && reply.length) {
                        commentBusy = true;
                        $('body').css('cursor', 'wait');
                        $.get('filer/' + id + '?term=' + reply, NavUpdate);
-/*                             if(timer) clearTimeout(timer);
-                       timer = setTimeout(NavUpdate,3000);*/
                        liking = 1;
-/*                             $.colorbox.close();*/
                }
        });
-
-/*             var bordercolor = $("input").css("border-color");
-       
-       $.get('filer/', function(data){
-               $.colorbox({html:data});
-               $("#id_term").keypress(function(){
-                       $(this).css("border-color",bordercolor);
-               })
-               $("#select_term").change(function(){
-                       $("#id_term").css("border-color",bordercolor);
-               })
-               
-               $("#filer_save").click(function(e){
-                       e.preventDefault();
-                       reply = $("#id_term").val();
-                       if(reply && reply.length) {
-                               commentBusy = true;
-                               $('body').css('cursor', 'wait');
-                               $.get('filer/' + id + '?term=' + reply);
-                               if(timer) clearTimeout(timer);
-                               timer = setTimeout(NavUpdate,3000);
-                               liking = 1;
-                               $.colorbox.close();
-                       } else {
-                               $("#id_term").css("border-color","#FF0000");
-                       }
-                       return false;
-               });
-       });
-*/             
 }
 
-
-
 /*
  * Comments
  */
-
-
 function commentOpen(obj,id) {
        if(obj.value == window.commentEmptyText) {
                obj.value = "";
@@ -699,16 +428,6 @@ function qCommentInsert(obj,id) {
        $(obj).val("");
 }
 
-/*function showHideCommentBox(id) {
-       if( $('#comment-edit-form-' + id).is(':visible')) {
-               $('#comment-edit-form-' + id).hide();
-       }
-       else {
-               $('#comment-edit-form-' + id).show();
-       }
-}*/
-
-
 function insertFormatting(comment,BBcode,id) {
        
        var tmpStr = $("#comment-edit-text-" + id).val();
@@ -745,5 +464,3 @@ function cmtBbOpen(id) {
 function cmtBbClose(id) {
        $(".comment-edit-bb-" + id).hide();
 }
-
-
index 11aa31116aba2a5e53cb92b8e19df827d16d3c67..439ea9db122200da7821be174d4f3c2d15ecf6ef 100644 (file)
@@ -1,33 +1,14 @@
-
-{{*<!--                <script>
-               $(document).ready( function () {
-                       $(document).mouseup(function(e) {
-                               var container = $("#comment-edit-wrapper-{{$id}}");
-                               if( container.has(e.target).length === 0) {
-                                       commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
-                                       cmtBbClose({{$id}});
-                               }
-                       });
-               });
-               </script>-->*}}
-
-               <div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
-                       <form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
-{{*<!--                        <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+               <div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+                       <form class="comment-edit-form {{$indent}}" 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="source" value="{{$sourceapp}}" />
                                <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" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-                               {{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
                                        <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" 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;" title="{{$edbold}}"
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
                                                data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
-{{*<!--                                        <li><a class="editicon imagebb shadow"
-                                               style="cursor: pointer;" title="{{$edimg}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
-                                       <li><a class="editicon urlbb shadow"
-                                               style="cursor: pointer;" title="{{$edurl}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
-                                       <li><a class="editicon videobb shadow"
-                                               style="cursor: pointer;" title="{{$edvideo}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$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}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
-                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc}}">{{$qc}}</option>                                
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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="preview-link 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>
index 5684ca7be93c906ebfb965ab9d652b2ce2f43191..759efb216c6b970a0ef3abf062d22c77198663a6 100644 (file)
@@ -11,8 +11,8 @@
 
 <link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
 <link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
+         href="{{$baseurl}}/opensearch"
+         type="application/opensearchdescription+xml"
          title="Search in Friendica" />
 
 <script>
index eb326b1da25953a9cd765e96510b9a9f8234eb52..b883dfa0b1be2b362f018799608377d45212063e 100644 (file)
 
        <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
                <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-       </div> 
-       
+       </div>
+
        <div id="profile-upload-wrapper" style="display: {{$visitor}};" >
                <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-       </div> 
+       </div>
     {{*<!--<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
        </div> -->*}}
        </div>
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
                <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
                <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-location-wrapper" style="display: {{$visitor}};" >
                <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-       </div> 
+       </div>
 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
                <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
index 21044eb912655717c96b5042ada5cbad22c0d9f1..563abd452775825ee515f1124aaa0bbee1a9669f 100644 (file)
@@ -8,7 +8,7 @@
                                <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}}" >
+                               <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>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                               </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>                      
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
index 57124bce09a8d0c084f5895c7f6f725798d18456..ca0d143c2d8cf3716308a1dafabf22d6ca9d98ac 100644 (file)
@@ -12,11 +12,6 @@ $(document).ready(function() {
                '#system-menu-list-closing': false
        };
 
-/*    $.ajaxSetup({ 
-        cache: false 
-    });*/
-
-
        /* enable tinymce on focus and click */
        $("#profile-jot-text").focus(enableOnUser);
        $("#profile-jot-text").click(enableOnUser);
@@ -27,8 +22,6 @@ $(document).ready(function() {
                hideNavMenu($(this).attr('point'));
        });
 
-/*     $('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
-
        $('.group-edit-icon').hover(
                function() {
                        $(this).addClass('icon'); $(this).removeClass('iconspacer');},
@@ -64,15 +57,9 @@ $(document).ready(function() {
                        $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
        );
 
-/*     $('.nav-load-page-link').click(function() {
-               getPageContent( $(this).attr('href') );
-               hideNavMenu( '#' + $(this).closest('ul').attr('id') );
-               return false;
-       });*/
-
        $('#id_share').change(function() {
 
-               if ($('#id_share').is(':checked')) { 
+               if ($('#id_share').is(':checked')) {
                        $('#acl-wrapper').show();
                }
                else {
@@ -80,21 +67,7 @@ $(document).ready(function() {
                }
        }).trigger('change');
 
-// For event_end.tpl
-/*             $('#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');*/
-
-
-       if(typeof window.AjaxUpload != "undefined") {
+       if (typeof window.AjaxUpload != "undefined") {
                var uploader = new window.AjaxUpload(
                        window.imageUploadButton,
                        { action: 'wall_upload/'+window.nickname,
@@ -103,11 +76,11 @@ $(document).ready(function() {
                                onComplete: function(file,response) {
                                        addeditortext(window.jotId, response);
                                        $('#profile-rotator').hide();
-                               }                                
+                               }
                        }
                );
 
-               if($('#wall-file-upload').length) {
+               if ($('#wall-file-upload').length) {
                        var file_uploader = new window.AjaxUpload(
                                'wall-file-upload',
                                { action: 'wall_attach/'+window.nickname,
@@ -116,14 +89,14 @@ $(document).ready(function() {
                                        onComplete: function(file,response) {
                                                addeditortext(window.jotId, response);
                                                $('#profile-rotator').hide();
-                                       }                                
+                                       }
                                }
                        );
                }
        }
 
 
-       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
+       if (typeof window.aclInit !="undefined" && typeof acl=="undefined") {
                acl = new ACL(
                        baseurl+"/acl",
                        [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@@ -131,7 +104,7 @@ $(document).ready(function() {
        }
 
 
-       if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
+       if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
                $('#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() {
@@ -139,7 +112,7 @@ $(document).ready(function() {
                                $('#jot-perms-icon').removeClass('unlock').addClass('lock');
                                $('#jot-public').hide();
                        });
-                       if(selstr == null) { 
+                       if (selstr == null) {
                                $('#jot-perms-icon').removeClass('lock').addClass('unlock');
                                $('#jot-public').show();
                        }
@@ -147,28 +120,28 @@ $(document).ready(function() {
                }).trigger('change');
        }
 
-       if(window.aclType == "event_head") {
+       if (window.aclType == "event_head") {
                $('#events-calendar').fullCalendar({
                        events: baseurl + window.eventModuleUrl +'/json/',
                        header: {
                                left: 'prev,next today',
                                center: 'title',
                                right: 'month,agendaWeek,agendaDay'
-                       },                      
+                       },
                        timeFormat: 'H(:mm)',
                        eventClick: function(calEvent, jsEvent, view) {
                                showEvent(calEvent.id);
                        },
                        loading: function(isLoading, view) {
-                               if(!isLoading) {
+                               if (!isLoading) {
                                        $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
                                }
                        },
-                       
+
                        eventRender: function(event, element, view) {
                                //console.log(view.name);
                                if (event.item['author-name']==null) return;
-                               switch(view.name){
+                               switch(view.name) {
                                        case "month":
                                        element.find(".fc-title").html(
                                                "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
@@ -197,9 +170,9 @@ $(document).ready(function() {
                                        break;
                                }
                        }
-                       
+
                });
-               
+
                // center on date
                var args=location.href.replace(baseurl,"").split("/");
                if (args.length>=5 && window.eventModeParams == 2) {
@@ -211,7 +184,7 @@ $(document).ready(function() {
                // show event popup
                var hash = location.hash.split("-")
                if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-       }       
+       }
 
 
        switch(window.autocompleteType) {
@@ -224,13 +197,13 @@ $(document).ready(function() {
                        $("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
 
 
-                       $("#contacts-search").keyup(function(event){
-                               if(event.keyCode == 13){
+                       $("#contacts-search").keyup(function(event) {
+                               if (event.keyCode == 13) {
                                        $("#contacts-search").click();
                                }
                        });
-                       $(".autocomplete-w1 .selected").keyup(function(event){
-                               if(event.keyCode == 13){
+                       $(".autocomplete-w1 .selected").keyup(function(event) {
+                               if (event.keyCode == 13) {
                                        $("#contacts-search").click();
                                }
                        });
@@ -242,16 +215,9 @@ $(document).ready(function() {
                        break;
        }
 
-/*     if(window.autoCompleteType == "display-head") {
-               //$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-               // make auto-complete work in more places
-               //$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-               $(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-       }*/
-
        // Add Colorbox for viewing Network page images
        //var cBoxClasses = new Array();
-       $(".wall-item-body a img").each(function(){
+       $(".wall-item-body a img").each(function() {
                var aElem = $(this).parent();
                var imgHref = aElem.attr("href");
 
@@ -259,16 +225,12 @@ $(document).ready(function() {
                // We'll try to do this by looking for links of the form
                // .../photo/ab803d8eg08daf85023adfec08 (with nothing more following), in hopes
                // that that will be unique enough
-               if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
+               if (imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
 
                        // Add a unique class to all the images of a certain post, to allow scrolling through
                        var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
                        $(this).addClass(cBoxClass);
 
-//                     if( $.inArray(cBoxClass, cBoxClasses) < 0 ) {
-//                             cBoxClasses.push(cBoxClass);
-//                     }
-
                        aElem.colorbox({
                                maxHeight: '90%',
                                photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
@@ -276,21 +238,13 @@ $(document).ready(function() {
                        });
                }
        });
-       /*$.each(cBoxClasses, function(){
-               $('.'+this).colorbox({
-                       maxHeight: '90%',
-                       photo: true,
-                       rel: this
-               });
-       });*/
-
 });
 
 
 // update pending count //
-$(function(){
+$(function() {
 
-       $("nav").bind('nav-update',  function(e,data){
+       $("nav").bind('nav-update',  function(e,data) {
                var elm = $('#pending-update');
                var register = $(data).find('register').text();
                if (register=="0") { register=""; elm.hide();} else { elm.show(); }
@@ -299,35 +253,37 @@ $(function(){
 });
 
 
-$(function(){
-       
-       $("#cnftheme").click(function(){
+$(function() {
+
+       $("#cnftheme").click(function() {
                $.colorbox({
                        width: 800,
                        height: '90%',
                        href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(),
-                       onComplete: function(){
-                               $("div#fancybox-content form").submit(function(e){
+                       onComplete: function() {
+                               $("div#fancybox-content form").submit(function(e) {
                                        var url = $(this).attr('action');
                                        // can't get .serialize() to work...
                                        var data={};
-                                       $(this).find("input").each(function(){
+                                       $(this).find("input").each(function() {
                                                data[$(this).attr('name')] = $(this).val();
                                        });
-                                       $(this).find("select").each(function(){
+                                       $(this).find("select").each(function() {
                                                data[$(this).attr('name')] = $(this).children(":selected").val();
                                        });
                                        console.log(":)", url, data);
-                               
+
                                        $.post(url, data, function(data) {
-                                               if(timer) clearTimeout(timer);
+                                               if (timer) {
+                                                       clearTimeout(timer);
+                                               }
                                                NavUpdate();
                                                $.colorbox.close();
                                        })
-                               
+
                                        return false;
                                });
-                       
+
                        }
                });
                return false;
@@ -336,18 +292,18 @@ $(function(){
 
 
 function homeRedirect() {
-       $('html').fadeOut('slow', function(){
+       $('html').fadeOut('slow', function() {
                window.location = baseurl + "/login";
        });
 }
 
 
-if(typeof window.photoEdit != 'undefined') {
+if (typeof window.photoEdit != 'undefined') {
 
        $(document).keydown(function(event) {
 
-                       if(window.prevLink != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }}
-                       if(window.nextLink != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }}
+                       if (window.prevLink != '') { if (event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }}
+                       if (window.nextLink != '') { if (event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }}
 
        });
 }
@@ -355,11 +311,11 @@ if(typeof window.photoEdit != 'undefined') {
 function showEvent(eventid) {
        $.get(
                baseurl + window.eventModuleUrl + '/?id=' + eventid,
-               function(data){
+               function(data) {
                        $.colorbox({html:data});
                        $.colorbox.resize();
                }
-       );                      
+       );
 }
 
 function doEventPreview() {
@@ -396,60 +352,15 @@ function initCrop() {
        });
 }
 
-
-/*
-$(document).mouseup(function (clickPos) {
-
-       var sysMenu = $("#system-menu-list");
-       var sysMenuLink = $(".system-menu-link");
-       var contactsMenu = $("#contacts-menu-list");
-       var contactsMenuLink = $(".contacts-menu-link");
-       var networkMenu = $("#network-menu-list");
-       var networkMenuLink = $(".network-menu-link");
-
-       if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) {
-               hideNavMenu("#system-menu-list");
-       }
-       if( !contactsMenu.is(clickPos.target) && !contactsMenuLink.is(clickPos.target) && contactsMenu.has(clickPos.target).length === 0) {
-               hideNavMenu("#contacts-menu-list");
-       }
-       if( !networkMenu.is(clickPos.target) && !networkMenuLink.is(clickPos.target) && networkMenu.has(clickPos.target).length === 0) {
-               hideNavMenu("#network-menu-list");
-       }
-});
-
-
-function getPageContent(url) {
-
-       var pos = $('.main-container').position();
-
-       $('.main-container').css('margin-left', pos.left);      
-       $('.main-content-container').hide(0, function () {
-               $('.main-content-loading').show(0);
-       });
-
-       $.get(url, function(html) {
-               console.log($('.main-content-container').html());
-               $('.main-content-container').html( $('.main-content-container', html).html() );
-               console.log($('.main-content-container').html());
-               $('.main-content-loading').hide(function() {
-                       $('.main-content-container').fadeIn(800,function() {
-                               $('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
-                       });
-               });
-       });
-}
-*/
-
 function showNavMenu(menuID) {
 
-       if(window.navMenuTimeout[menuID + '-closing']) {
+       if (window.navMenuTimeout[menuID + '-closing']) {
                window.navMenuTimeout[menuID + '-closing'] = false;
                clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
        }
        else {
                window.navMenuTimeout[menuID + '-opening'] = true;
-               
+
                window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
                        $(menuID).slideDown('fast').show();
                        window.navMenuTimeout[menuID + '-opening'] = false;
@@ -459,13 +370,13 @@ function showNavMenu(menuID) {
 
 function hideNavMenu(menuID) {
 
-       if(window.navMenuTimeout[menuID + '-opening']) {
+       if (window.navMenuTimeout[menuID + '-opening']) {
                window.navMenuTimeout[menuID + '-opening'] = false;
                clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
        }
        else {
                window.navMenuTimeout[menuID + '-closing'] = true;
-               
+
                window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
                        $(menuID).slideUp('fast');
                        window.navMenuTimeout[menuID + '-closing'] = false;
@@ -507,11 +418,11 @@ function InitMCEEditor(editorData) {
                //setup : // SPECIFIC
        };
 
-       if(window.editSelect != 'none') {
+       if (window.editSelect != 'none') {
                $.extend(tinyMCEInitConfig, editorData);
                tinyMCE.init(tinyMCEInitConfig);
        }
-       else if(typeof editorData.plaintextFn == 'function') {
+       else if (typeof editorData.plaintextFn == 'function') {
                (editorData.plaintextFn)();
        }
 }
@@ -519,8 +430,8 @@ function InitMCEEditor(editorData) {
 var editor = false;
 var textlen = 0;
 
-function initEditor(cb){
-       if(editor==false) {
+function initEditor(cb) {
+       if (editor==false) {
                editor = true;
                $("#profile-jot-text-loading").show();
 
@@ -534,45 +445,45 @@ function initEditor(cb){
                        setup : function(ed) {
                                cPopup = null;
                                ed.onKeyDown.add(function(ed,e) {
-                                       if(cPopup !== null)
+                                       if (cPopup !== null)
                                                cPopup.onkey(e);
                                });
 
                                ed.onKeyUp.add(function(ed, e) {
                                        var txt = tinyMCE.activeEditor.getContent();
                                        match = txt.match(/@([^ \n]+)$/);
-                                       if(match!==null) {
-                                               if(cPopup === null) {
+                                       if (match!==null) {
+                                               if (cPopup === null) {
                                                        cPopup = new ACPopup(this,baseurl+"/acl");
                                                }
-                                               if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-                                               if(! cPopup.ready) cPopup = null;
+                                               if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+                                               if (! cPopup.ready) cPopup = null;
                                        }
                                        else {
-                                               if(cPopup !== null) { cPopup.close(); cPopup = null; }
+                                               if (cPopup !== null) { cPopup.close(); cPopup = null; }
                                        }
 
                                        textlen = txt.length;
-                                       if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+                                       if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
                                                $('#profile-jot-desc').html(window.isPublic);
                                        }
                                        else {
                                                $('#profile-jot-desc').html('&nbsp;');
-                                       }        
+                                       }
 
-                                //Character count
+                                       //Character count
 
-                                       if(textlen <= 140) {
+                                       if (textlen <= 140) {
                                                $('#character-counter').removeClass('red');
                                                $('#character-counter').removeClass('orange');
                                                $('#character-counter').addClass('grey');
                                        }
-                                       if((textlen > 140) && (textlen <= 420)) {
+                                       if ((textlen > 140) && (textlen <= 420)) {
                                                $('#character-counter').removeClass('grey');
                                                $('#character-counter').removeClass('red');
                                                $('#character-counter').addClass('orange');
                                        }
-                                       if(textlen > 420) {
+                                       if (textlen > 420) {
                                                $('#character-counter').removeClass('grey');
                                                $('#character-counter').removeClass('orange');
                                                $('#character-counter').addClass('red');
@@ -602,13 +513,13 @@ function initEditor(cb){
                $("a#jot-perms-icon").colorbox({
                        'inline' : true,
                        'transition' : 'elastic'
-               }); 
+               });
        } else {
                if (typeof cb!="undefined") cb();
        }
 }
 
-function enableOnUser(){
+function enableOnUser() {
        if (editor) return;
        $(this).val("");
        initEditor();
@@ -626,31 +537,31 @@ function msgInitEditor() {
                setup : function(ed) {
                        cPopup = null;
                        ed.onKeyDown.add(function(ed,e) {
-                               if(cPopup !== null)
+                               if (cPopup !== null)
                                        cPopup.onkey(e);
                        });
 
                        ed.onKeyUp.add(function(ed, e) {
                                var txt = tinyMCE.activeEditor.getContent();
                                match = txt.match(/@([^ \n]+)$/);
-                               if(match!==null) {
-                                       if(cPopup === null) {
+                               if (match!==null) {
+                                       if (cPopup === null) {
                                                cPopup = new ACPopup(this,baseurl+"/acl");
                                        }
-                                       if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-                                       if(! cPopup.ready) cPopup = null;
+                                       if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+                                       if (! cPopup.ready) cPopup = null;
                                }
                                else {
-                                       if(cPopup !== null) { cPopup.close(); cPopup = null; }
+                                       if (cPopup !== null) { cPopup.close(); cPopup = null; }
                                }
 
                                textlen = txt.length;
-                               if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+                               if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
                                        $('#profile-jot-desc').html(window.isPublic);
                                }
                                else {
                                        $('#profile-jot-desc').html('&nbsp;');
-                               }        
+                               }
                        });
 
                        ed.onInit.add(function(ed) {
@@ -718,7 +629,7 @@ function profInitEditor() {
  */
 
 function addeditortext(textElem, data) {
-       if(window.editSelect == 'none') {
+       if (window.editSelect == 'none') {
                var currentText = $(textElem).val();
                $(textElem).val(currentText + data);
        }
@@ -728,53 +639,22 @@ function addeditortext(textElem, data) {
 
 function jotVideoURL() {
        reply = prompt(window.vidURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
        }
 }
 
 function jotAudioURL() {
        reply = prompt(window.audURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
        }
 }
 
 
 function jotGetLocation() {
-
-/*     if(navigator.geolocation) {
-
-               navigator.geolocation.getCurrentPosition(function(position) {
-                       var lat = position.coords.latitude;
-                       var lng = position.coords.longitude;
-
-                       $.ajax({
-                               type: 'GET',
-                               url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
-                               jsonp: 'json_callback',
-                               contentType: 'application/json',
-                               dataType: 'jsonp',
-                               success: function(json) {
-                                       console.log(json);
-                                       var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
-                                       $('#jot-location').val(locationDisplay);
-                                       $('#jot-display-location').html('Location: '+locationDisplay);
-                                       $('#jot-display-location').show();
-                               }
-                       });
-               });
-
-       }
-       else {
-               reply = prompt(window.whereAreU, $('#jot-location').val());
-               if(reply && reply.length) {
-                       $('#jot-location').val(reply);
-               }
-       }*/
-
        reply = prompt(window.whereAreU, $('#jot-location').val());
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                $('#jot-location').val(reply);
        }
 }
@@ -785,7 +665,7 @@ function jotShare(id) {
        $('#like-rotator-' + id).show();
        $.get('share/' + id, function(data) {
                if (!editor) $("#profile-jot-text").val("");
-               initEditor(function(){
+               initEditor(function() {
                        addeditortext("#profile-jot-text", data);
                        $('#like-rotator-' + id).hide();
                        $(window).scrollTop(0);
@@ -802,7 +682,7 @@ function jotClearLocation() {
 
 function jotGetLink() {
        reply = prompt(window.linkURL);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                reply = bin2hex(reply);
                $('#profile-rotator').show();
                $.get('parse_url?binurl=' + reply, function(data) {
@@ -815,36 +695,26 @@ function jotGetLink() {
 
 function linkdropper(event) {
        var linkFound = event.dataTransfer.types.contains("text/uri-list");
-       if(linkFound)
+       if (linkFound)
                event.preventDefault();
 }
 
 
 function linkdrop(event) {
        var reply = event.dataTransfer.getData("text/uri-list");
-       //event.target.textContent = reply;
        event.preventDefault();
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                reply = bin2hex(reply);
                $('#profile-rotator').show();
                $.get('parse_url?binurl=' + reply, function(data) {
-/*                     if(window.jotId == "#profile-jot-text") {
-                               if (!editor) $("#profile-jot-text").val("");
-                               initEditor(function(){
-                                       addeditortext(window.jotId, data);
-                                       $('#profile-rotator').hide();
-                               });
-                       }
-                       else {*/
                        addeditortext(window.jotId, data);
                        $('#profile-rotator').hide();
-//                     }
                });
        }
 }
 
 
-if(typeof window.geoTag === 'function') window.geoTag();
+if (typeof window.geoTag === 'function') window.geoTag();
 
 
 /*
@@ -854,20 +724,20 @@ if(typeof window.geoTag === 'function') window.geoTag();
 function confirmDelete() { return confirm(window.delItem); }
 
 function deleteCheckedItems(delID) {
-       if(confirm(window.delItems)) {
+       if (confirm(window.delItems)) {
                var checkedstr = '';
 
                $(delID).hide();
                $(delID + '-rotator').show();
                $('.item-select').each( function() {
-                       if($(this).is(':checked')) {
-                               if(checkedstr.length != 0) {
+                       if ($(this).is(':checked')) {
+                               if (checkedstr.length != 0) {
                                        checkedstr = checkedstr + ',' + $(this).val();
                                }
                                else {
                                        checkedstr = $(this).val();
                                }
-                       }       
+                       }
                });
                $.post('item', { dropitems: checkedstr }, function(data) {
                        window.location.reload();
@@ -877,44 +747,40 @@ function deleteCheckedItems(delID) {
 
 function itemTag(id) {
        reply = prompt(window.term);
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                reply = reply.replace('#','');
-               if(reply.length) {
+               if (reply.length) {
 
                        commentBusy = true;
                        $('body').css('cursor', 'wait');
 
                        $.get('tagger/' + id + '?term=' + reply, NavUpdate);
-                       /*if(timer) clearTimeout(timer);
-                       timer = setTimeout(NavUpdate,3000);*/
                        liking = 1;
                }
        }
 }
 
 function itemFiler(id) {
-       
+
        var bordercolor = $("input").css("border-color");
-       
-       $.get('filer/', function(data){
+
+       $.get('filer/', function(data) {
                $.colorbox({html:data});
                $.colorbox.resize();
-               $("#id_term").keypress(function(){
+               $("#id_term").keypress(function() {
                        $(this).css("border-color",bordercolor);
                })
-               $("#select_term").change(function(){
+               $("#select_term").change(function() {
                        $("#id_term").css("border-color",bordercolor);
                })
-               
-               $("#filer_save").click(function(e){
+
+               $("#filer_save").click(function(e) {
                        e.preventDefault();
                        reply = $("#id_term").val();
-                       if(reply && reply.length) {
+                       if (reply && reply.length) {
                                commentBusy = true;
                                $('body').css('cursor', 'wait');
                                $.get('filer/' + id + '?term=' + reply, NavUpdate);
-/*                                     if(timer) clearTimeout(timer);
-                               timer = setTimeout(NavUpdate,3000);*/
                                liking = 1;
                                $.colorbox.close();
                        } else {
@@ -923,7 +789,7 @@ function itemFiler(id) {
                        return false;
                });
        });
-       
+
 }
 
 
@@ -1020,13 +886,3 @@ function qCommentInsert(obj,id) {
        $("#comment-edit-text-" + id).val(tmpStr + ins);
        $(obj).val("");
 }
-
-/*function showHideCommentBox(id) {
-       if( $('#comment-edit-form-' + id).is(':visible')) {
-               $('#comment-edit-form-' + id).hide();
-       }
-       else {
-               $('#comment-edit-form-' + id).show();
-       }
-}*/
-
index 56adbb1af3d9730c43ddeeaa475ea04883fd5cb4..995bd9db93710e425dd05505dfa293e19ca72394 100644 (file)
@@ -1,20 +1,5 @@
-
-{{*<!--                <script>
-               $(document).ready( function () {
-                       $(document).mouseup(function(e) {
-                               var container = $("#comment-edit-wrapper-{{$id}}");
-                               if( container.has(e.target).length === 0) {
-                                       commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
-                                       cmtBbClose({{$id}});
-                               }
-                       });
-               });
-               </script>-->*}}
-
                <div class="comment-wwedit-wrapper {{$indent}}" 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;">
-{{*<!--                        <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-                       <form class="comment-edit-form" style="display: none;" 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}}" />
@@ -23,10 +8,7 @@
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-{{*<!--                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
                                        <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" 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="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$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}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
-                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc}}">{{$qc}}</option>                                
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
index fc56c24b78e6e836ac3eb1ac7dc84a96d2e52f44..496aba8664a9ad689657a57df1c2bf87e074278c 100644 (file)
@@ -13,8 +13,8 @@
 
 <link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
 <link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
+         href="{{$baseurl}}/opensearch"
+         type="application/opensearchdescription+xml"
          title="Search in Friendica" />
 
 <script>
index 08627b04d80bad105c92b9e7868dee0ba67ccf51..b0301476a367b25f2b89069f403be8fc28b0d201 100644 (file)
 
        <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
                <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-       </div> 
-       
+       </div>
+
        <div id="profile-upload-wrapper" style="display: {{$visitor}};" >
                <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
-       </div> 
+       </div>
        <div id="profile-attach-wrapper" style="display: {{$visitor}};" >
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
-       </div> 
+       </div>
 
        {{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->*}}
        <div id="profile-link-wrapper" style="display: {{$visitor}};" >
                <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
                <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
                <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-location-wrapper" style="display: {{$visitor}};" >
                <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
-       </div> 
+       </div>
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
-       </div> 
+       </div>
 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
                <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
index 21044eb912655717c96b5042ada5cbad22c0d9f1..563abd452775825ee515f1124aaa0bbee1a9669f 100644 (file)
@@ -8,7 +8,7 @@
                                <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}}" >
+                               <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>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                               </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>                      
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
index 20417c1e186f96bd1b1fbc2e70bbb471796d8d0f..c7eef70a8d2a95e7ac6fae50877fc4f0f2edf74b 100644 (file)
@@ -8,7 +8,7 @@
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-                               <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+                               <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>
                                <ul id="comment-edit-bb-{{$id}}"
                                        name="body" 
                                        onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
-                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc}}">{{$qc}}</option>                                
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <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>
index a2d4f0e1d903349dba25ebac599dbfad9035a8f9..dbc8a59132733bfccd9adc17a2c4b296533c44a8 100644 (file)
@@ -5,7 +5,7 @@ $(document).ready(function() {
 
 });
 function tautogrow(id) {
-$("textarea#comment-edit-text-" + id).autogrow();
+       $("textarea#comment-edit-text-" + id).autogrow();
 };
 
 function insertFormatting(comment, BBcode, id) {
@@ -42,12 +42,9 @@ return true;
 }
 
 function cmtBbOpen(id) {
-$(".comment-edit-bb-" + id).show();
+       $(".comment-edit-bb-" + id).show();
 }
 function cmtBbClose(id) {
     $(".comment-edit-bb-" + id).hide();
 }
-
-
-
 </script>
index d820c6d3a28fd936d54e3d5e10106a57b4ce4419..e3e6294f0c81938222eb55d124de8ac6d4273b26 100644 (file)
@@ -1,6 +1,6 @@
 
 
-<div id="profile-jot-wrapper" > 
+<div id="profile-jot-wrapper" >
        <div id="profile-jot-banner-wrapper">
                <div id="profile-jot-desc" >&nbsp;</div>
                <div id="character-counter" class="grey" style="display: none;">0</div>
        </div>
        <div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
-       </div>  
+       </div>
        <div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
                <a href="#" id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
                <a href="#" id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
                <a href="#" id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
                <a href="#" id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
-       </div> 
+       </div>
        <div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
                <a href="#" id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
-       </div> 
+       </div>
 
        <span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
 
@@ -66,7 +66,7 @@
        {{$jotplugins}}
        </div>
        <div id="profile-jot-tools-end"></div>
-       
+
        <div id="jot-preview-content" style="display:none;"></div>
 
         <div style="display: none;">
index 189110a952d21813a26d7bbadf279d91501922da..74f1c0b1e1bb7de134ce0c4196b5e46f2072a952 100644 (file)
@@ -57,41 +57,41 @@ function cmtBbClose(comment, id) {
 }
 $(document).ready(function() {
 
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+       $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
-$('.group-edit-icon').hover(
-       function() {
-               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.group-edit-icon').hover(
+               function() {
+                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.sidebar-group-element').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+       $('.sidebar-group-element').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
        );
 
 
-$('.savedsearchdrop').hover(
-       function() {
-               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.savedsearchdrop').hover(
+               function() {
+                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.savedsearchterm').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+       $('.savedsearchterm').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
        );
 
 });
@@ -108,7 +108,7 @@ _js_in_foot();
 
 }
 
-if(! function_exists('_js_in_foot')) {
+if (! function_exists('_js_in_foot')) {
        function _js_in_foot() {
                /** @purpose insert stuff in bottom of page
                */
index 7a9627b7795771e5c929ffcc0512f31b196555a5..8515001e5c64fd8c017c3b1b782382d624386b49 100644 (file)
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-                               <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+                               <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>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
                                {{if $qcomment}}
-                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+                                       <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc}}">{{$qc}}</option>                                
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
 
                                <div class="comment-edit-bb">
                                        <a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>      
index b909a26025e64d18eba10a074e4277144c345518..4abc9d2a81001cb9e7d33b8a0550b8efc0a0aa98 100644 (file)
@@ -29,10 +29,10 @@ function vier_init(&$a) {
                $a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
                $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
        }
-               // deactivated since it doesn't work with desktop browsers at the moment (To-Do)
-               //$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
+       /// @todo deactivated since it doesn't work with desktop browsers at the moment
+       //$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
 
-$a->page['htmlhead'] .= <<< EOT
+       $a->page['htmlhead'] .= <<< EOT
 <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
 <script type="text/javascript">
 
@@ -66,7 +66,6 @@ function insertFormatting(comment,BBcode,id) {
        return true;
 }
 
-
 function showThread(id) {
        $("#collapsed-comments-" + id).show()
        $("#collapsed-comments-" + id + " .collapsed-comments").show()
@@ -76,22 +75,17 @@ function hideThread(id) {
        $("#collapsed-comments-" + id + " .collapsed-comments").hide()
 }
 
-
 function cmtBbOpen(id) {
        $("#comment-edit-bb-" + id).show();
 }
 function cmtBbClose(id) {
        $("#comment-edit-bb-" + id).hide();
 }
-
-
-
 </script>
 EOT;
 
-
-if ($a->is_mobile || $a->is_tablet){
-       $a->page['htmlhead'] .= <<< EOT
+       if ($a->is_mobile || $a->is_tablet){
+               $a->page['htmlhead'] .= <<< EOT
 <script>
        $(document).ready(function() {
                $(".mobile-aside-toggle a").click(function(e){
@@ -104,13 +98,13 @@ if ($a->is_mobile || $a->is_tablet){
        });
 </script>
 EOT;
-}
-
+       }
 
        // Hide the left menu bar
        if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
-                                                                       "probe", "webfinger", "login", "invite", "credits")))
+                                                                       "probe", "webfinger", "login", "invite", "credits"))) {
                $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
+       }
 }
 
 function get_vier_config($key, $default = false, $admin = false) {
@@ -142,7 +136,7 @@ function vier_community_info() {
        $aside['$url'] = $url;
 
        // comunity_profiles
-       if($show_profiles) {
+       if ($show_profiles) {
 
                $r = suggestion_query(local_user(), 0, 9);
 
@@ -166,7 +160,7 @@ function vier_community_info() {
        }
 
        // last 9 users
-       if($show_lastusers) {
+       if ($show_lastusers) {
                $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
                $order = " ORDER BY `register_date` DESC ";
 
@@ -215,11 +209,11 @@ function vier_community_info() {
        }
 
        //Community_Pages at right_aside
-       if($show_pages AND local_user()) {
+       if ($show_pages AND local_user()) {
 
                require_once('include/ForumManager.php');
 
-               if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+               if (x($_GET['cid']) && intval($_GET['cid']) != 0)
                        $cid = $_GET['cid'];
 
                //sort by last updated item
@@ -229,7 +223,7 @@ function vier_community_info() {
                $total = count($contacts);
                $visible_forums = 10;
 
-               if(count($contacts)) {
+               if (count($contacts)) {
 
                        $id = 0;
 
@@ -267,7 +261,7 @@ function vier_community_info() {
        //END Community Page
 
        //helpers
-       if($show_helpers) {
+       if ($show_helpers) {
                $r = array();
 
                $helperlist = get_config("vier", "helperlist");