]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #3121 from annando/1701-bugfix-config
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 28 Jan 2017 07:30:22 +0000 (08:30 +0100)
committerGitHub <noreply@github.com>
Sat, 28 Jan 2017 07:30:22 +0000 (08:30 +0100)
Issue 3117: Can't store values that are only in the .htconfig.php

38 files changed:
.editorconfig [new file with mode: 0644]
boot.php
include/datetime.php
include/dfrn.php
include/event.php
js/main.js
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/frio/templates/js_strings.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/js/quattro.js
view/theme/quattro/templates/comment_item.tpl
view/theme/quattro/templates/jot.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/templates/event_form.tpl
view/theme/vier/theme.php

diff --git a/.editorconfig b/.editorconfig
new file mode 100644 (file)
index 0000000..7692ac7
--- /dev/null
@@ -0,0 +1,10 @@
+# editorconfig tool configuration
+# see http://editorconfig.org for docs
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespaces = true
+indent_style = tab
index 92dd051671f95513436470c642de46177509d154..a9a062e62372f0820a414c645b76c39016e96cd1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -970,7 +970,6 @@ class App {
                        '$local_user' => local_user(),
                        '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
                        '$delitem' => t('Delete this item?'),
-                       '$comment' => t('Comment'),
                        '$showmore' => t('show more'),
                        '$showfewer' => t('show fewer'),
                        '$update_interval' => $interval,
index 779c7a5aadae7f9b46e33fa1525130bbf3abad9b..8d4961cd7c39334776487958711a40e99036ac10 100644 (file)
@@ -571,6 +571,17 @@ function update_contact_birthdays() {
                         *
                         */
 
+                       // Check for duplicates
+                       $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
+                               intval($rr['uid']),
+                               intval($rr['id']),
+                               dbesc(datetime_convert('UTC','UTC', $nextbd)),
+                               dbesc('birthday'));
+
+                       if (dbm::is_result($s)) {
+                               continue;
+                       }
+
                        $bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
                        $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
 
index ccb43fa98e463d2059059087b2f3b79d75dc9cd7..e9bdaec6649772abaf5b8ebfe7da6666c5c5bd0a 100644 (file)
@@ -1105,12 +1105,22 @@ class dfrn {
         */
        private function birthday_event($contact, $birthday) {
 
+               // Check for duplicates
+               $r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
+                       intval($contact["uid"]),
+                       intval($contact["id"]),
+                       dbesc(datetime_convert("UTC","UTC", $birthday)),
+                       dbesc("birthday"));
+
+               if (dbm::is_result($r)) {
+                       return;
+               }
+
                logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
 
                $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
                $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ;
 
-
                $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
                        intval($contact["uid"]),
index 785558beddadb994425be575867243a66a903ac8..9e5bafbdb0837c200b0644edca11b51154ea3b17 100644 (file)
@@ -493,6 +493,26 @@ function get_event_strings() {
        return $i18n;
 }
 
+/// @todo We should replace this with a separate update function if there is some time left
+/**
+ * @brief Removes duplicated birthday events
+ *
+ * @param array $dates Array of possibly duplicated events
+ * @return array Cleaned events
+ */
+function event_remove_duplicates($dates) {
+       $dates2 = array();
+
+       foreach ($dates AS $date) {
+               if ($date['type'] == 'birthday') {
+                       $dates2[$date['uid']."-".$date['cid']."-".$date['start']] = $date;
+               } else {
+                       $dates2[] = $date;
+               }
+       }
+       return $dates2;
+}
+
 /**
  * @brief Get an event by its event ID
  *
@@ -516,9 +536,9 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
                intval($event_params["event_id"])
        );
 
-       if (dbm::is_result($r))
-               return $r;
-
+       if (dbm::is_result($r)) {
+               return event_remove_duplicates($r);
+       }
 }
 
 /**
@@ -558,8 +578,9 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
                        dbesc($event_params["adjust_finish"])
        );
 
-       if (dbm::is_result($r))
-               return $r;
+       if (dbm::is_result($r)) {
+               return event_remove_duplicates($r);
+       }
 }
 
 /**
@@ -568,7 +589,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
  * @param array $arr Event query array
  * @return array Event array for the template
  */
-function process_events ($arr) {
+function process_events($arr) {
        $events=array();
 
        $last_date = '';
index 13bd50bd8fcdbe4471f30ca025a98a271f216772..aaeef00cf731a03c12de3d6e8a5e95d1ee98695e 100644 (file)
        }
 
        function openMenu(theID) {
-               document.getElementById(theID).style.display = "block"
+               var el = document.getElementById(theID)
+               if (el) {
+                       el.style.display = "block";
+               }
        }
 
        function closeMenu(theID) {
-               document.getElementById(theID).style.display = "none"
+               var el = document.getElementById(theID)
+               if (el) {
+                       el.style.display = "none";
+               }
        }
 
        function decodeHtml(html) {
                /* setup comment textarea buttons */
                /* comment textarea buttons needs some "data-*" attributes to work:
                 *              data-role="insert-formatting" : to mark the element as a formatting button
-                *              data-comment="<string>" : string for "Comment", used by insertFormatting() function
                 *              data-bbcode="<string>" : name of the bbcode element to insert. insertFormatting() will insert it as "[name][/name]"
                 *              data-id="<string>" : id of the comment, used to find other comment-related element, like the textarea
                 * */
                $('body').on('click','[data-role="insert-formatting"]', function(e) {
                        e.preventDefault();
                        var o = $(this);
-                       var comment = o.data('comment');
                        var bbcode  = o.data('bbcode');
                        var id = o.data('id');
                        if (bbcode=="img") {
                                Dialog.doImageBrowser("comment", id);
                                return;
                        }
-                       insertFormatting(comment, bbcode, id);
+                       insertFormatting(bbcode, id);
                });
 
                /* event from comment textarea button popups */
index af4c60b268a25ec760ae2a8555b75a1d8fec08da..27d8499c2809699d655b375f745c55a36dcb9d12 100644 (file)
@@ -1589,7 +1589,6 @@ function photos_content(App $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..63ec5d728b453d75fbefae77afe4bd69c1c57b23 100644 (file)
                                        <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}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
                                {{if $qcomment}}
                                        <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 036d59ca0d2f31856212dfe21d2300845d013538..0772af0bc18b2e7f5281792fc61b1958d52427f5 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();
@@ -71,8 +71,7 @@
                return true;
        }
        function commentOpen(obj,id) {
-               if(obj.value == '{{$comment}}') {
-                       obj.value = '';
+               if (obj.value == "") {
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        $("#mod-cmnt-wrap-" + id).show();
@@ -82,8 +81,7 @@
                return false;
        }
        function commentClose(obj,id) {
-               if(obj.value == '') {
-                       obj.value = '{{$comment}}';
+               if (obj.value == "") {
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                        $("#mod-cmnt-wrap-" + id).hide();
 
        function commentInsert(obj,id) {
                var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == '{{$comment}}') {
-                       tmpStr = '';
+               if (tmpStr == "") {
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
                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);
        }
 
        function qCommentInsert(obj,id) {
                var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == '{{$comment}}') {
-                       tmpStr = '';
+               if (tmpStr == "") {
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
                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..e4692a8bba69fb389289f8f913a0b483d51cd9b3 100644 (file)
@@ -25,7 +25,7 @@
                {{/if}}
                <div id="jot-text-wrap">
                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
                </div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 
        <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..1fc4df37ff64439175526471c1966a3e64b5251f 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>
                                        <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
                                        <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl|escape:'html'}}" />
                                </div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></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..f1ef37f14bbab660a609ae54c31d491bdd1c3368 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>
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>   
+                                               data-role="insert-formatting" 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(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>                       
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});"></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..e5c2e5b9ad25f23e149ab31b8f175dec40750173 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>
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               onclick="insertFormatting('b', {{$id}});"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               onclick="insertFormatting('i', {{$id}});"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               onclick="insertFormatting('u', {{$id}});"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               onclick="insertFormatting('quote', {{$id}});"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               onclick="insertFormatting('code', {{$id}});"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               onclick="insertFormatting('img', {{$id}});"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               onclick="insertFormatting('url', {{$id}});"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                                               onclick="insertFormatting('video', {{$id}});"></a></li>
+                               </ul>
                                <div class="comment-edit-bb-end"></div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>                      
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></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 7d3c22469fba8d09996350d580099c2834fc08d6..c674a99d99ad848bb250c72667a8372860f80c97 100644 (file)
@@ -23,92 +23,85 @@ set_template_engine($a, 'smarty3');
     }
 $a->page['htmlhead'] .= <<< EOT
 <script>
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
 function cmtBbOpen(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..6856d12ba28737202e34f115621190fe8fc6f1cf 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
@@ -121,8 +121,7 @@ var FileBrowser = {
                        // work as expected (we need a way to wait until commentOpenUI would be finished).\r
                        // As for now we insert pieces of this function here\r
                        if ((commentElm !== null) && (typeof commentElm !== "undefined")) {\r
-                               if (commentElm.value == aStr.comment){\r
-                                       commentElm.value = "";\r
+                               if (commentElm.value == "") {\r
                                        $("#comment-edit-text-" + FileBrowser.id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");\r
                                        $("#comment-edit-submit-wrapper-" + FileBrowser.id).show();\r
                                        $("#comment-edit-text-" + FileBrowser.id).attr('tabindex','9');\r
@@ -142,11 +141,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 +162,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 +187,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..9c5c1823d1b624c1c295e08b963b075e6d53a91c 100644 (file)
@@ -1,35 +1,35 @@
-/* 
+/*
  * @brief The file contains functions for text editing and commenting
  */
 
 
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode,id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == '') {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
@@ -61,8 +61,7 @@ function commentExpand(id) {
 }
 
 function commentClose(obj,id) {
-       if(obj.value == '') {
-               obj.value = aStr.comment;
+       if (obj.value == '') {
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).hide();
@@ -85,15 +84,14 @@ function commentOpenUI(obj, id) {
        $(document).unbind( "click.commentOpen", handler );
 
        var handler = function() {
-               if(obj.value == aStr.comment) {
-                       obj.value = '';
+               if (obj.value == '') {
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
                        // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
                        // The submit button gets tabindex + 1
                        $("#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"));
                }
        };
@@ -105,8 +103,7 @@ function commentCloseUI(obj, id) {
        $(document).unbind( "click.commentClose", handler );
 
        var handler = function() {
-               if(obj.value === '') {
-               obj.value = aStr.comment;
+               if (obj.value === '') {
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
                        $("#comment-edit-text-" + id).removeAttr('tabindex');
                        $("#comment-edit-submit-" + id).removeAttr('tabindex');
@@ -119,21 +116,16 @@ function commentCloseUI(obj, id) {
        $(document).bind( "click.commentClose", handler );
 }
 
-// test if there is default content in the jot text box and remove it
 function jotTextOpenUI(obj) {
-       if(obj.value == aStr.share) {
-               obj.value = '';
+       if (obj.value == '') {
                $(".modal-body #profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
                // initiale autosize for the jot
                autosize($(".modal-body #profile-jot-text"));
        }
 }
 
-// insert default content into the jot text box
-// if it's empty
 function jotTextCloseUI(obj) {
-       if(obj.value === '') {
-       obj.value = aStr.share;
+       if (obj.value === '') {
                $(".modal-body #profile-jot-text").removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
                // destroy the automatic textarea resizing
                autosize.destroy($(".modal-body #profile-jot-text"));
@@ -141,8 +133,7 @@ function jotTextCloseUI(obj) {
 }
 
 function commentOpen(obj,id) {
-       if(obj.value == aStr.comment) {
-               obj.value = '';
+       if (obj.value == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).show();
@@ -154,8 +145,7 @@ function commentOpen(obj,id) {
 
 function commentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == aStr.comment) {
-               tmpStr = '';
+       if (tmpStr == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
@@ -170,8 +160,7 @@ function commentInsert(obj,id) {
 
 function qCommentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == aStr.comment) {
-               tmpStr = '';
+       if (tmpStr == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
index 50b9ff0b0b124149476c94fe9ce4f73a084f77e6..a195c4dc04cd13444f877525ecb1f628428131cb 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>
+                       <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});"></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>
                        {{/if}}
                        <ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
                                <li>
-                                       <a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}">
+                                       <a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
                                                <i class="fa fa-picture-o"></i>
                                        </a>
                                </li>
                                <li>
-                                       <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">
+                                       <a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
                                                <i class="fa fa-link"></i>
                                        </a>
                                </li>
                                <li>
-                                       <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">
+                                       <a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
                                                <i class="fa fa-video-camera"></i>
                                        </a>
                                </li>
 
                                <li>
-                                       <a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">
+                                       <a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
                                                <i class="fa fa-underline"></i>
                                        </a>
                                </li>
                                <li>
-                                       <a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">
+                                       <a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
                                                <i class="fa fa-italic"></i>
                                        </a>
                                </li>
                                <li>
-                                       <a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">
+                                       <a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
                                                <i class="fa fa-bold"></i>
                                        </a>
                                </li>
                                <li>
-                                       <a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">
+                                       <a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
                                                <i class="fa fa-quote-left"></i>
                                        </a>
                                </li>
index 1c777a8e9899a5344bb1352b54ce3d07eacc5c6b..90d17f6c4707a2a32c01a6ae6e9d182c018f585b 100644 (file)
@@ -62,7 +62,7 @@
 
                                        {{* The jot text field in which the post text is inserted *}}
                                        <div id="jot-text-wrap">
-                                       <textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+                                       <textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{/if}}</textarea>
                                        </div>
 
                                        <ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
@@ -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>
@@ -123,9 +123,5 @@ can load different content into the jot moadl (e.g. the item edit jot)
        $('iframe').load(function() {
                this.style.height = this.contentWindow.document.body.offsetHeight + 'px';
        });
-
-       // insert new object with value to aStr
-       // function jotTextOpenUI does make use of it
-       aStr.share = "{{$share}}";
 </script>
 
index 3bec57a9df0714fccd16c6d4e43cfdd90af809c4..2576cede75bc7e8c6cb8a3b6ca2a7a23f9cb7b79 100644 (file)
@@ -8,7 +8,6 @@ They are loaded into the html <head> so that js functions can use them *}}
        var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
        var aStr = {
                'delitem'     : "{{$delitem}}",
-               'comment'     : "{{$comment}}"
        };
 
        {{* Create an object with the data which is needed for infinite scroll.
index a17dc1b2a4415bd61fea5a2de712c998317f4cad..abb2ed7c426e288dcb732b16b72fbc2c99c09b29 100644 (file)
@@ -5,7 +5,6 @@ $(document).ready(function() {
        $("#profile-jot-text").click(enableOnUser);
 
        $('#event-share-checkbox').change(function() {
-
                if ($('#event-share-checkbox').is(':checked')) {
                        $('#acl-wrapper').show();
                }
@@ -14,7 +13,6 @@ $(document).ready(function() {
                }
        }).trigger('change');
 
-
        $(".popupbox").click(function () {
                var parent = $( $(this).attr('href') ).parent();
                if (parent.css('display') == 'none') {
@@ -27,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,
@@ -40,7 +38,7 @@ $(document).ready(function() {
                        }
                );
 
-               if($('#wall-file-upload').length) {
+               if ($('#wall-file-upload').length) {
                        var file_uploader = new window.AjaxUpload(
                                'wall-file-upload',
                                { action: 'wall_attach/' + window.nickname,
@@ -56,7 +54,7 @@ $(document).ready(function() {
        }
 
 
-       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 ]
@@ -73,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();
                                }
                        });
@@ -91,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() {
@@ -108,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();
                        }
@@ -116,7 +105,7 @@ $(document).ready(function() {
                }).trigger('change');
        }
 
-       if(window.aclType == "event_head") {
+       if (window.aclType == "event_head") {
                $('#events-calendar').fullCalendar({
                        events: baseurl + window.eventModuleUrl +'/json/',
                        header: {
@@ -132,7 +121,7 @@ $(document).ready(function() {
                        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(
@@ -180,9 +169,9 @@ $(document).ready(function() {
 });
 
 // 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(); }
@@ -193,7 +182,7 @@ $(function(){
 
 
 function homeRedirect() {
-       $('html').fadeOut('slow', function(){
+       $('html').fadeOut('slow', function() {
                window.location = baseurl + "/login";
        });
 }
@@ -227,12 +216,6 @@ function initCrop() {
 
 
 function showEvent(eventid) {
-/*     $.get(
-               baseurl + window.eventModuleUrl + '/?id=' + eventid,
-               function(data){
-                       $.colorbox({html:data});
-               }
-       );*/
 }
 
 /*
@@ -282,14 +265,14 @@ 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]');
        }
 }
@@ -297,7 +280,7 @@ function jotAudioURL() {
 
 function jotGetLocation() {
        reply = prompt(window.whereAreU, $('#jot-location').val());
-       if(reply && reply.length) {
+       if (reply && reply.length) {
                $('#jot-location').val(reply);
        }
 }
@@ -308,7 +291,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);
@@ -319,7 +302,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) {
@@ -329,35 +312,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();
 
 
 
@@ -367,35 +327,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;
                }
@@ -403,64 +345,25 @@ 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 = "";
+       if (obj.value == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).show();
@@ -468,8 +371,7 @@ function commentOpen(obj,id) {
        }
 }
 function commentClose(obj,id) {
-       if(obj.value == "") {
-               obj.value = window.commentEmptyText;
+       if (obj.value == "") {
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).hide();
@@ -480,8 +382,7 @@ function commentClose(obj,id) {
 
 function commentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
@@ -496,8 +397,7 @@ function commentInsert(obj,id) {
 
 function qCommentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
@@ -511,43 +411,33 @@ 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) {
-
+function insertFormatting(BBcode, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == comment) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
-               $("#comment-edit-text-" + id).val(tmpStr);
        }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
@@ -557,5 +447,3 @@ function cmtBbOpen(id) {
 function cmtBbClose(id) {
        $(".comment-edit-bb-" + id).hide();
 }
-
-
index 11aa31116aba2a5e53cb92b8e19df827d16d3c67..ba68b4604dbb8886ab11a49de9c5b4aa089fe4ff 100644 (file)
@@ -1,79 +1,44 @@
-
-{{*<!--                <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}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <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>
+                                               data-role="insert-formatting" data-bbcode="code" data-id="{{$id}}"></a></li>
+                               </ul>
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});"></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..b60a2a4784b870b20b479fdec832da9a3222196a 100644 (file)
 
 <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>
        window.delItem = "{{$delitem}}";
-       window.commentEmptyText = "{{$comment}}";
        window.showMore = "{{$showmore}}";
        window.showFewer = "{{$showfewer}}";
        var updateInterval = {{$update_interval}};
index eb326b1da25953a9cd765e96510b9a9f8234eb52..0c31681b82705a393df7ea9bfc5a27931887673b 100644 (file)
@@ -26,7 +26,7 @@
                {{/if}}
                <div id="jot-text-wrap">
                {{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
                </div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 
        <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..e5c2e5b9ad25f23e149ab31b8f175dec40750173 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>
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               onclick="insertFormatting('b', {{$id}});"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               onclick="insertFormatting('i', {{$id}});"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               onclick="insertFormatting('u', {{$id}});"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               onclick="insertFormatting('quote', {{$id}});"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               onclick="insertFormatting('code', {{$id}});"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               onclick="insertFormatting('img', {{$id}});"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               onclick="insertFormatting('url', {{$id}});"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                                               onclick="insertFormatting('video', {{$id}});"></a></li>
+                               </ul>
                                <div class="comment-edit-bb-end"></div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>                      
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></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 44dc700aba3abb78ea99fb623e23582953b6ba60..52e181a6226f76cb62fe2b256bb1561e9d259c63 100644 (file)
@@ -12,11 +12,6 @@ $(document).ready(function() {
                '#system-menu-list-closing': false
        };
 
-/*    $.ajaxSetup({
-        cache: false
-    });*/
-
-
        /* enable editor 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,37 +57,16 @@ $(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')) {
                        $('#acl-wrapper').show();
-               }
-               else {
+               } else {
                        $('#acl-wrapper').hide();
                }
        }).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,
@@ -107,7 +79,7 @@ $(document).ready(function() {
                        }
                );
 
-               if($('#wall-file-upload').length) {
+               if ($('#wall-file-upload').length) {
                        var file_uploader = new window.AjaxUpload(
                                'wall-file-upload',
                                { action: 'wall_attach/'+window.nickname,
@@ -123,7 +95,7 @@ $(document).ready(function() {
        }
 
 
-       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 +103,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 +111,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,7 +119,7 @@ $(document).ready(function() {
                }).trigger('change');
        }
 
-       if(window.aclType == "event_head") {
+       if (window.aclType == "event_head") {
                $('#events-calendar').fullCalendar({
                        events: baseurl + window.eventModuleUrl +'/json/',
                        header: {
@@ -160,7 +132,7 @@ $(document).ready(function() {
                                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'); });
                                }
                        },
@@ -168,7 +140,7 @@ $(document).ready(function() {
                        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(
@@ -224,13 +196,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 +214,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 +224,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 +237,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,28 +252,30 @@ $(function(){
 });
 
 
-$(function(){
+$(function() {
 
-       $("#cnftheme").click(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();
                                        })
@@ -336,18 +291,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,7 +310,7 @@ if(typeof window.photoEdit != 'undefined') {
 function showEvent(eventid) {
        $.get(
                baseurl + window.eventModuleUrl + '/?id=' + eventid,
-               function(data){
+               function(data) {
                        $.colorbox({html:data});
                        $.colorbox.resize();
                }
@@ -396,58 +351,12 @@ 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 {
+       } else {
                window.navMenuTimeout[menuID + '-opening'] = true;
 
                window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@@ -459,11 +368,10 @@ 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 {
+       } else {
                window.navMenuTimeout[menuID + '-closing'] = true;
 
                window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@@ -526,53 +434,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);
        }
 }
@@ -583,7 +460,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);
@@ -600,7 +477,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) {
@@ -613,36 +490,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();
 
 
 /*
@@ -652,17 +519,16 @@ 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 {
+                               } else {
                                        checkedstr = $(this).val();
                                }
                        }
@@ -675,16 +541,14 @@ 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;
                }
        }
@@ -694,25 +558,23 @@ 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 {
@@ -729,33 +591,33 @@ function itemFiler(id) {
  * Comments
  */
 
-function insertFormatting(comment,BBcode,id) {
-
+function insertFormatting(BBcode, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == comment) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
-               $("#comment-edit-text-" + id).val(tmpStr);
        }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
@@ -767,8 +629,7 @@ function cmtBbClose(id) {
 }
 
 function commentOpen(obj,id) {
-       if(obj.value == window.commentEmptyText) {
-               obj.value = "";
+       if (obj.value == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).show();
@@ -776,8 +637,7 @@ function commentOpen(obj,id) {
        }
 }
 function commentClose(obj,id) {
-       if(obj.value == "") {
-               obj.value = window.commentEmptyText;
+       if (obj.value == "") {
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                $("#mod-cmnt-wrap-" + id).hide();
@@ -788,8 +648,7 @@ function commentClose(obj,id) {
 
 function commentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
@@ -804,8 +663,7 @@ function commentInsert(obj,id) {
 
 function qCommentInsert(obj,id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
+       if (tmpStr == "") {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                openMenu("comment-edit-submit-wrapper-" + id);
@@ -818,13 +676,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..4de33ca782e423a457042c4433ac9261cd99747c 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}}" />
                                <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}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
+                               </ul>
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});"></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..21144eb0c21f4117ccbaf1e971db7325ee2a4593 100644 (file)
 
 <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>
        window.delItem = "{{$delitem}}";
-       window.commentEmptyText = "{{$comment}}";
        window.showMore = "{{$showmore}}";
        window.showFewer = "{{$showfewer}}";
        var updateInterval = {{$update_interval}};
index 08627b04d80bad105c92b9e7868dee0ba67ccf51..c0ba9b0457a3c42c9301724d5d689086dd17fdbd 100644 (file)
@@ -25,7 +25,7 @@
                {{/if}}
                <div id="jot-text-wrap">
                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
                </div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 
        <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..e5c2e5b9ad25f23e149ab31b8f175dec40750173 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>
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               onclick="insertFormatting('b', {{$id}});"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               onclick="insertFormatting('i', {{$id}});"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               onclick="insertFormatting('u', {{$id}});"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               onclick="insertFormatting('quote', {{$id}});"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               onclick="insertFormatting('code', {{$id}});"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               onclick="insertFormatting('img', {{$id}});"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               onclick="insertFormatting('url', {{$id}});"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
-                               </ul>   
+                                               onclick="insertFormatting('video', {{$id}});"></a></li>
+                               </ul>
                                <div class="comment-edit-bb-end"></div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>                      
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></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 259874a299d4fb634852ead2c2fc19dc221bf90b..9ef66e220e42b4139e5cf2cb3668f3583b94d165 100644 (file)
@@ -59,33 +59,33 @@ $(document).ready(function(){
        });
 });
 
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
index 20417c1e186f96bd1b1fbc2e70bbb471796d8d0f..c314acc66cde55f94705817b5a9bca71d385d8c8 100644 (file)
@@ -8,50 +8,51 @@
                                <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}}"
                                        class="comment-edit-bb">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
+                                               data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>
+                                               data-role="insert-formatting" 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>   
-                               <textarea id="comment-edit-text-{{$id}}" 
-                                       class="comment-edit-text-empty" 
-                                       name="body" 
-                                       onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea>
+                                               data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
+                               </ul>
+                               <textarea id="comment-edit-text-{{$id}}"
+                                       class="comment-edit-text-empty"
+                                       name="body"
+                                       placeholder="{{$comment}}"
+                                       onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});"></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 41d633b25c3191f01ee65fd43123862091180602..97fb0c24ff917f101cae7e35d62c8b24f9dc38d3 100644 (file)
@@ -21,7 +21,7 @@
                <input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
                {{/if}}
 
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
 
                <ul id="jot-tools" class="jothidden" style="display:none">
                        <li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>
index a2d4f0e1d903349dba25ebac599dbfad9035a8f9..caebe37711b9475a5c42de9eb76f6e132551086b 100644 (file)
@@ -5,49 +5,47 @@ $(document).ready(function() {
 
 });
 function tautogrow(id) {
-$("textarea#comment-edit-text-" + id).autogrow();
+       $("textarea#comment-edit-text-" + id).autogrow();
 };
 
-function insertFormatting(comment, BBcode, id) {
-var tmpStr = $("#comment-edit-text-" + id).val();
-if(tmpStr == comment) {
-tmpStr = "";
-$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-openMenu("comment-edit-submit-wrapper-" + id);
-}
-textarea = document.getElementById("comment-edit-text-" + id);
-if (document.selection) {
-textarea.focus();
-selected = document.selection.createRange();
-if (BBcode == "url") {
-selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-} else {
-selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-}
-} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-var start = textarea.selectionStart;
-var end = textarea.selectionEnd;
-if (BBcode == "url") {
-textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-+ "http://" + textarea.value.substring(start, end)
-+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-} else {
-textarea.value = textarea.value.substring(0, start)
-+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-+ textarea.value.substring(end, textarea.value.length);
-}
-}
-return true;
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
+
+       textarea = document.getElementById("comment-edit-text-" + id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url") {
+                       selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url") {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
+                               + "http://" + textarea.value.substring(start, end)
+                               + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start)
+                               + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+                               + textarea.value.substring(end, textarea.value.length);
+               }
+       }
+
+       return true;
 }
 
 function cmtBbOpen(id) {
-$(".comment-edit-bb-" + id).show();
+       $(".comment-edit-bb-" + id).show();
 }
 function cmtBbClose(id) {
     $(".comment-edit-bb-" + id).hide();
 }
-
-
-
 </script>
index d820c6d3a28fd936d54e3d5e10106a57b4ce4419..26578dafceed3cf7180bb0039613883485953700 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>
@@ -26,9 +26,8 @@
                {{/if}}
                <div id="jot-text-wrap">
                        <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
-                       <textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
-                       {{if $content}}{{$content}}{{else}}{{$share}}
-                       {{/if}}
+                       <textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">
+                       {{if $content}}{{$content}}{{/if}}
                        </textarea>
                </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 +65,7 @@
        {{$jotplugins}}
        </div>
        <div id="profile-jot-tools-end"></div>
-       
+
        <div id="jot-preview-content" style="display:none;"></div>
 
         <div style="display: none;">
index 7e8744f0d170e307d6fd9d727e7c9da29a90929d..62713e00cd9e854d9bb7e9fab8a6d7c60c9d15d7 100644 (file)
@@ -19,33 +19,33 @@ function smoothly_init(App $a) {
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
@@ -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..3e72df6dc6cf40d61640195dfa3902202b816af2 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>
+                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});"></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>      
-                                       <a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
-                                       <a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
-                                                                                
-                                       <a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
-                                       <a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
-                                       <a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
-                                       <a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
+                                       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
+                                       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
+                                       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
+
+                                       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
+                                       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
+                                       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
+                                       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
 
                                 </div>
                                        <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
index 0507c36aa19e17429c99f8f8aa4c16da027c36dc..35e05c02d502fac307eae582b4c0cae88943fc38 100644 (file)
 <div id="event-desc-text">{{$d_text}}</div>
 <textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc" autocomplete="off">{{$d_orig}}</textarea>
 <div id="event-desc-text-edit-bb" class="comment-edit-bb">
-       <a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>      
-       <a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
-       <a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
-
-       <a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
-       <a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
-       <a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
-       <a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
+       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>
+       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
+       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
+
+       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
+       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
+       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
+       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
 </div>
 
 <div id="event-location-text">{{$l_text}}</div>
 <textarea id="comment-edit-text-location" rows="4" cols="64" name="location">{{$l_orig}}</textarea>
 <div id="event-location-text-edit-bb" class="comment-edit-bb">
-       <a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>      
-       <a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
-       <a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
-
-       <a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
-       <a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
-       <a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
-       <a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
+       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>
+       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
+       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
+
+       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
+       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
+       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
+       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
 </div>
 
 <div id="event-location-break"></div>
index 12c588a2447958fbb16ebdffc4bc104734823e72..a35afa719bd5cd3207cef574f26ab8a756147c59 100644 (file)
@@ -29,44 +29,43 @@ function vier_init(App $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">
 
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               } else {
+                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+               }
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
+               if (BBcode == "url") {
                        textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               } else {
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+               }
        }
+
        return true;
 }
 
-
 function 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");