Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaning up, actual changes are in the next commits

Browse source 
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
This commit is contained in:
Hypolite Petovan 2017-01-08 01:49:13 +11:00
parent 8d195dc499
commit daa8e4f901
28 changed files with 315 additions and 828 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mod/photos.php
View file

@ -1583,7 +1583,6 @@ function photos_content(&$a) {
'$id' => $link_item['id'], '$id' => $link_item['id'],
'$likethis' => t("I like this \x28toggle\x29"), '$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't 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'), '$wait' => t('Please wait'),
'$return_path' => $a->query_string, '$return_path' => $a->query_string,
)); ));

33
view/templates/head.tpl
View file

@ -56,14 +56,14 @@
For the relevant js part look at function loadContent() in main.js. *}} For the relevant js part look at function loadContent() in main.js. *}}
{{if $infinite_scroll}} {{if $infinite_scroll}}
var infinite_scroll = { var infinite_scroll = {
'pageno' : {{$infinite_scroll.pageno}}, "pageno" : {{$infinite_scroll.pageno}},
'reload_uri' : "{{$infinite_scroll.reload_uri}}" "reload_uri" : "{{$infinite_scroll.reload_uri}}"
} }
{{/if}} {{/if}}
function confirmDelete() { return confirm("{{$delitem}}"); } function confirmDelete() { return confirm("{{$delitem}}"); }
function commentExpand(id) { 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).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).focus(); $("#comment-edit-text-" + id).focus();
@ -104,10 +104,10 @@
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $(obj).html(); var ins = $(obj).html();
ins = ins.replace('&lt;','<'); ins = ins.replace("&lt;","<");
ins = ins.replace('&gt;','>'); ins = ins.replace("&gt;",">");
ins = ins.replace('&amp;','&'); ins = ins.replace("&amp;","&");
ins = ins.replace('&quot;','"'); ins = ins.replace("&quot;",""");
$("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
} }
@ -120,23 +120,22 @@
openMenu("comment-edit-submit-wrapper-" + id); openMenu("comment-edit-submit-wrapper-" + id);
} }
var ins = $(obj).val(); var ins = $(obj).val();
ins = ins.replace('&lt;','<'); ins = ins.replace("&lt;","<");
ins = ins.replace('&gt;','>'); ins = ins.replace("&gt;",">");
ins = ins.replace('&amp;','&'); ins = ins.replace("&amp;","&");
ins = ins.replace('&quot;','"'); ins = ins.replace("&quot;",""");
$("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val(''); $(obj).val("");
} }
window.showMore = "{{$showmore}}"; window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}"; window.showFewer = "{{$showfewer}}";
function showHideCommentBox(id) { function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) { if ($("#comment-edit-form-" + id).is(":visible")) {
$('#comment-edit-form-' + id).hide(); $("#comment-edit-form-" + id).hide();
} } else {
else { $("#comment-edit-form-" + id).show();
$('#comment-edit-form-' + id).show();
} }
} }

4
view/templates/moderated_comment.tpl
View file

@ -8,7 +8,7 @@
<input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <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> <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>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
@ -23,7 +23,7 @@
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea> <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<div class="comment-edit-text-end"></div> <div class="comment-edit-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'}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>

7
view/theme/duepuntozero/templates/comment_item.tpl
View file

@ -13,7 +13,7 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
@ -46,7 +46,7 @@
<div class="comment-edit-bb-end"></div> <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" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
@ -55,7 +55,7 @@
{{/if}} {{/if}}
<div class="comment-edit-text-end"></div> <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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
@ -63,5 +63,4 @@
<div class="comment-edit-end"></div> <div class="comment-edit-end"></div>
</form> </form>
</div> </div>

4
view/theme/duepuntozero/templates/moderated_comment.tpl
View file

@ -8,7 +8,7 @@
<input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
@ -50,7 +50,7 @@
<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" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<div class="comment-edit-text-end"></div> <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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>

19
view/theme/duepuntozero/theme.php
View file

@ -54,31 +54,27 @@ function insertFormatting(comment,BBcode,id) {
} }
function cmtBbOpen(comment, id) { function cmtBbOpen(comment, id) {
if($(comment).hasClass('comment-edit-text-full')) { if ($(comment).hasClass('comment-edit-text-full')) {
$(".comment-edit-bb-" + id).show(); $(".comment-edit-bb-" + id).show();
return true; return true;
} }
return false; return false;
} }
function cmtBbClose(comment, id) { function cmtBbClose(comment, id) {
// if($(comment).hasClass('comment-edit-text-empty')) {
// $(".comment-edit-bb-" + id).hide();
// return true;
// }
return false; return false;
} }
$(document).ready(function() { $(document).ready(function() {
$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$(this).removeClass('icon'); $(this).addClass('iconspacer');} $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$('.sidebar-group-element').hover( $('.sidebar-group-element').hover(
function() { function() {
id = $(this).attr('id'); id = $(this).attr('id');
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
@ -89,14 +85,14 @@ $('.sidebar-group-element').hover(
); );
$('.savedsearchdrop').hover( $('.savedsearchdrop').hover(
function() { function() {
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$('.savedsearchterm').hover( $('.savedsearchterm').hover(
function() { function() {
id = $(this).attr('id'); id = $(this).attr('id');
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
@ -105,10 +101,7 @@ $('.savedsearchterm').hover(
id = $(this).attr('id'); id = $(this).attr('id');
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
); );
}); });
</script> </script>
EOT; EOT;
} }

15
view/theme/frio/js/filebrowser.js
View file

@ -93,18 +93,18 @@ var FileBrowser = {
$(".error").addClass("hidden"); $(".error").addClass("hidden");
}); });
$(".folders a, .path a").on("click", function(e){ $(".folders a, .path a").on("click", function(e) {
e.preventDefault(); e.preventDefault();
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function(){ $(".fbrowser").load(url,function() {
$(function() {FileBrowser.init(nickname, type, hash);}); $(function() {FileBrowser.init(nickname, type, hash);});
}); });
}); });
//embed on click //embed on click
$(".photo-album-photo-link").on('click', function(e){ $(".photo-album-photo-link").on('click', function(e) {
e.preventDefault(); e.preventDefault();
var embed = ""; var embed = "";
@ -142,11 +142,6 @@ var FileBrowser = {
$('#modal').modal('hide'); $('#modal').modal('hide');
// update autosize for this textarea // update autosize for this textarea
autosize.update($(".text-autosize")); autosize.update($(".text-autosize"));
// if (id!=="") {
// commentExpand(FileBrowser.id);
// //$("#comment-edit-text-558").empty();
// };
}); });
if ($("#upload-image").length) if ($("#upload-image").length)
@ -168,7 +163,7 @@ var FileBrowser = {
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function(){ $(".fbrowser").load(url,function() {
$(function() {FileBrowser.init(nickname, type, hash);}); $(function() {FileBrowser.init(nickname, type, hash);});
}); });
} }
@ -193,7 +188,7 @@ var FileBrowser = {
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window // load new content to fbrowser window
$(".fbrowser").load(url,function(){ $(".fbrowser").load(url,function() {
$(function() {FileBrowser.init(nickname, type, hash);}); $(function() {FileBrowser.init(nickname, type, hash);});
}); });
} }

2
view/theme/frio/js/textedit.js
View file

@ -93,7 +93,7 @@ function commentOpenUI(obj, id) {
$("#comment-edit-text-" + id).attr('tabindex','9'); $("#comment-edit-text-" + id).attr('tabindex','9');
$("#comment-edit-submit-" + id).attr('tabindex','10'); $("#comment-edit-submit-" + id).attr('tabindex','10');
$("#comment-edit-submit-wrapper-" + id).show(); $("#comment-edit-submit-wrapper-" + id).show();
// initiale autosize for this comment // initialize autosize for this comment
autosize($("#comment-edit-text-" + id + ".text-autosize")); autosize($("#comment-edit-text-" + id + ".text-autosize"));
} }
}; };

6
view/theme/frio/templates/comment_item.tpl
View file

@ -13,15 +13,11 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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"> <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" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});">{{$comment}}</textarea>
</div> </div>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>

359
view/theme/frost-mobile/js/theme.js
View file

@ -4,46 +4,7 @@ $(document).ready(function() {
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
/*$('.group-edit-icon').hover(
function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.sidebar-group-element').hover(
function() {
id = $(this).attr('id');
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
);
$('.savedsearchdrop').hover(
function() {
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.savedsearchterm').hover(
function() {
id = $(this).attr('id');
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);*/
$('#event-share-checkbox').change(function() { $('#event-share-checkbox').change(function() {
if ($('#event-share-checkbox').is(':checked')) { if ($('#event-share-checkbox').is(':checked')) {
$('#acl-wrapper').show(); $('#acl-wrapper').show();
} }
@ -52,7 +13,6 @@ $(document).ready(function() {
} }
}).trigger('change'); }).trigger('change');
$(".popupbox").click(function () { $(".popupbox").click(function () {
var parent = $( $(this).attr('href') ).parent(); var parent = $( $(this).attr('href') ).parent();
if (parent.css('display') == 'none') { if (parent.css('display') == 'none') {
@ -65,7 +25,7 @@ $(document).ready(function() {
if(typeof window.AjaxUpload != "undefined") { if (typeof window.AjaxUpload != "undefined") {
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
window.imageUploadButton, window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname+'?nomce=1', { action: 'wall_upload/'+window.nickname+'?nomce=1',
@ -78,7 +38,7 @@ $(document).ready(function() {
} }
); );
if($('#wall-file-upload').length) { if ($('#wall-file-upload').length) {
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/'+window.nickname+'?nomce=1', { action: 'wall_attach/'+window.nickname+'?nomce=1',
@ -94,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( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@ -111,13 +71,13 @@ $(document).ready(function() {
$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true); $("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
$("#contacts-search").keyup(function(event){ $("#contacts-search").keyup(function(event) {
if(event.keyCode == 13){ if (event.keyCode == 13) {
$("#contacts-search").click(); $("#contacts-search").click();
} }
}); });
$(".autocomplete-w1 .selected").keyup(function(event){ $(".autocomplete-w1 .selected").keyup(function(event) {
if(event.keyCode == 13){ if (event.keyCode == 13) {
$("#contacts-search").click(); $("#contacts-search").click();
} }
}); });
@ -129,16 +89,7 @@ $(document).ready(function() {
break; break;
} }
if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
/* 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") {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@ -146,7 +97,7 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$('#jot-public').hide(); $('#jot-public').hide();
}); });
if(selstr == null) { if (selstr == null) {
$('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show(); $('#jot-public').show();
} }
@ -154,7 +105,7 @@ $(document).ready(function() {
}).trigger('change'); }).trigger('change');
} }
if(window.aclType == "event_head") { if (window.aclType == "event_head") {
$('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: baseurl + window.eventModuleUrl +'/json/', events: baseurl + window.eventModuleUrl +'/json/',
header: { header: {
@ -170,7 +121,7 @@ $(document).ready(function() {
eventRender: function(event, element, view) { eventRender: function(event, element, view) {
//console.log(view.name); //console.log(view.name);
if (event.item['author-name']==null) return; if (event.item['author-name']==null) return;
switch(view.name){ switch(view.name) {
case "month": case "month":
element.find(".fc-title").html( element.find(".fc-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
@ -218,9 +169,9 @@ $(document).ready(function() {
}); });
// update pending count // // update pending count //
$(function(){ $(function() {
$("nav").bind('nav-update', function(e,data){ $("nav").bind('nav-update', function(e,data) {
var elm = $('#pending-update'); var elm = $('#pending-update');
var register = $(data).find('register').text(); var register = $(data).find('register').text();
if (register=="0") { register=""; elm.hide();} else { elm.show(); } if (register=="0") { register=""; elm.hide();} else { elm.show(); }
@ -231,7 +182,7 @@ $(function(){
function homeRedirect() { function homeRedirect() {
$('html').fadeOut('slow', function(){ $('html').fadeOut('slow', function() {
window.location = baseurl + "/login"; window.location = baseurl + "/login";
}); });
} }
@ -265,12 +216,6 @@ function initCrop() {
function showEvent(eventid) { function showEvent(eventid) {
/* $.get(
baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){
$.colorbox({html:data});
}
);*/
} }
@ -284,18 +229,13 @@ var textlen = 0;
var plaintext = 'none';//window.editSelect; var plaintext = 'none';//window.editSelect;
//var ispublic = window.isPublic; //var ispublic = window.isPublic;
function initEditor(cb){ function initEditor(cb) {
if (editor==false){ if (editor==false) {
// $("#profile-jot-text-loading").show(); if (plaintext == 'none') {
if(plaintext == 'none') {
// $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
editor = true; editor = true;
/* $("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});*/
$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $("#profile-jot-acl-wrapper").parent(); var parent = $("#profile-jot-acl-wrapper").parent();
if (parent.css('display') == 'none') { if (parent.css('display') == 'none') {
@ -303,181 +243,49 @@ function initEditor(cb){
} else { } else {
parent.hide(); parent.hide();
} }
// $("#profile-jot-acl-wrapper").parent().toggle();
return false; return false;
}); });
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") {
cb();
}
return; return;
} }
/* tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: window.editSelect,
auto_focus: "profile-jot-text",
plugins : "bbcode,paste,autoresize, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
//Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$(".jothidden").show();
if (typeof cb!="undefined") cb();
});
}
});
editor = true;
// setup acl popup
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
}); */
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
} }
} }
function enableOnUser(){ function enableOnUser() {
if (editor) return; if (editor) {
return;
}
$(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
/*function wallInitEditor() {
var plaintext = window.editSelect;
if(plaintext != 'none') {
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
var editorId = ed.editorId;
var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") {
$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null);
}
});
}
});
}
else
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
}*/
/* /*
* Jot * Jot
*/ */
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') { if (window.editSelect == 'none') {
var currentText = $(textElem).val(); var currentText = $(textElem).val();
$(textElem).val(currentText + data); $(textElem).val(currentText + data);
} }
/* else
tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
} }
function jotVideoURL() { function jotVideoURL() {
reply = prompt(window.vidURL); reply = prompt(window.vidURL);
if(reply && reply.length) { if (reply && reply.length) {
addeditortext("#profile-jot-text", '[video]' + reply + '[/video]'); addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
} }
} }
function jotAudioURL() { function jotAudioURL() {
reply = prompt(window.audURL); reply = prompt(window.audURL);
if(reply && reply.length) { if (reply && reply.length) {
addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]'); addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
} }
} }
@ -485,7 +293,7 @@ function jotAudioURL() {
function jotGetLocation() { function jotGetLocation() {
reply = prompt(window.whereAreU, $('#jot-location').val()); reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) { if (reply && reply.length) {
$('#jot-location').val(reply); $('#jot-location').val(reply);
} }
} }
@ -496,7 +304,7 @@ function jotShare(id) {
$('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function() {
addeditortext("#profile-jot-text", data); addeditortext("#profile-jot-text", data);
$('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
$(window).scrollTop(0); $(window).scrollTop(0);
@ -507,7 +315,7 @@ function jotShare(id) {
function jotGetLink() { function jotGetLink() {
reply = prompt(window.linkURL); reply = prompt(window.linkURL);
if(reply && reply.length) { if (reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
@ -517,35 +325,12 @@ function jotGetLink() {
} }
} }
/*function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
event.preventDefault();
}
function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list");
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) {
//if (!editor) $("#profile-jot-text").val("");
//initEditor(function(){
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
//});
});
}
}*/
function jotClearLocation() { function jotClearLocation() {
$('#jot-coord').val(''); $('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();
} }
if(typeof window.geoTag === 'function') window.geoTag(); if (typeof window.geoTag === 'function') window.geoTag();
@ -555,35 +340,17 @@ if(typeof window.geoTag === 'function') window.geoTag();
function confirmDelete() { return confirm(window.delItem); } function 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) { function itemTag(id) {
reply = prompt(window.term); reply = prompt(window.term);
if(reply && reply.length) { if (reply && reply.length) {
reply = reply.replace('#',''); reply = reply.replace('#','');
if(reply.length) { if (reply.length) {
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply, NavUpdate); $.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer); /*if (timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
} }
@ -591,61 +358,23 @@ function itemTag(id) {
} }
function itemFiler(id) { function itemFiler(id) {
$.get('filer/', function(data) {
$.get('filer/', function(data){
var promptText = $('#id_term_label', data).text(); var promptText = $('#id_term_label', data).text();
reply = prompt(promptText); reply = prompt(promptText);
if(reply && reply.length) { if (reply && reply.length) {
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1; 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 * Comments
*/ */
function commentOpen(obj,id) { function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) { if(obj.value == window.commentEmptyText) {
obj.value = ""; obj.value = "";
@ -699,16 +428,6 @@ function qCommentInsert(obj,id) {
$(obj).val(""); $(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(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
@ -745,5 +464,3 @@ function cmtBbOpen(id) {
function cmtBbClose(id) { function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide(); $(".comment-edit-bb-" + id).hide();
} }

43
view/theme/frost-mobile/templates/comment_item.tpl
View file

@ -1,33 +1,14 @@
<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
{{*<!-- <script> <form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
$(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;">-->*}}
<input type="hidden" name="type" value="{{$type}}" /> <input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="source" value="{{$sourceapp}}" /> <input type="hidden" name="source" value="{{$sourceapp}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <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="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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> <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}}"> <ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow" <li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}" style="cursor: pointer;" title="{{$edbold}}"
@ -44,21 +25,10 @@
<li><a class="editicon codebb shadow" <li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}" 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-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> </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> <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
@ -67,13 +37,8 @@
{{/if}} {{/if}}
<div class="comment-edit-text-end"></div> <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}}" /> <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>
{{*<!--<div class="comment-edit-end"></div>-->*}}
</form> </form>
</div> </div>

4
view/theme/frost-mobile/templates/moderated_comment.tpl
View file

@ -8,7 +8,7 @@
<input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
@ -50,7 +50,7 @@
<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" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<div class="comment-edit-text-end"></div> <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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>

290
view/theme/frost/js/theme.js
View file

@ -12,11 +12,6 @@ $(document).ready(function() {
'#system-menu-list-closing': false '#system-menu-list-closing': false
}; };
/* $.ajaxSetup({
cache: false
});*/
/* enable tinymce on focus and click */ /* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
@ -27,8 +22,6 @@ $(document).ready(function() {
hideNavMenu($(this).attr('point')); hideNavMenu($(this).attr('point'));
}); });
/* $('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
@ -64,12 +57,6 @@ $(document).ready(function() {
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} $('#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() { $('#id_share').change(function() {
if ($('#id_share').is(':checked')) { if ($('#id_share').is(':checked')) {
@ -80,21 +67,7 @@ $(document).ready(function() {
} }
}).trigger('change'); }).trigger('change');
// For event_end.tpl if (typeof window.AjaxUpload != "undefined") {
/* $('#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") {
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
window.imageUploadButton, window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname, { action: 'wall_upload/'+window.nickname,
@ -107,7 +80,7 @@ $(document).ready(function() {
} }
); );
if($('#wall-file-upload').length) { if ($('#wall-file-upload').length) {
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'wall-file-upload', 'wall-file-upload',
{ action: 'wall_attach/'+window.nickname, { action: 'wall_attach/'+window.nickname,
@ -123,7 +96,7 @@ $(document).ready(function() {
} }
if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){ if (typeof window.aclInit !="undefined" && typeof acl=="undefined") {
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@ -131,7 +104,7 @@ $(document).ready(function() {
} }
if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") { if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@ -139,7 +112,7 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$('#jot-public').hide(); $('#jot-public').hide();
}); });
if(selstr == null) { if (selstr == null) {
$('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show(); $('#jot-public').show();
} }
@ -147,7 +120,7 @@ $(document).ready(function() {
}).trigger('change'); }).trigger('change');
} }
if(window.aclType == "event_head") { if (window.aclType == "event_head") {
$('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: baseurl + window.eventModuleUrl +'/json/', events: baseurl + window.eventModuleUrl +'/json/',
header: { header: {
@ -160,7 +133,7 @@ $(document).ready(function() {
showEvent(calEvent.id); showEvent(calEvent.id);
}, },
loading: function(isLoading, view) { loading: function(isLoading, view) {
if(!isLoading) { if (!isLoading) {
$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
} }
}, },
@ -168,7 +141,7 @@ $(document).ready(function() {
eventRender: function(event, element, view) { eventRender: function(event, element, view) {
//console.log(view.name); //console.log(view.name);
if (event.item['author-name']==null) return; if (event.item['author-name']==null) return;
switch(view.name){ switch(view.name) {
case "month": case "month":
element.find(".fc-title").html( element.find(".fc-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
@ -224,13 +197,13 @@ $(document).ready(function() {
$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true); $("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
$("#contacts-search").keyup(function(event){ $("#contacts-search").keyup(function(event) {
if(event.keyCode == 13){ if (event.keyCode == 13) {
$("#contacts-search").click(); $("#contacts-search").click();
} }
}); });
$(".autocomplete-w1 .selected").keyup(function(event){ $(".autocomplete-w1 .selected").keyup(function(event) {
if(event.keyCode == 13){ if (event.keyCode == 13) {
$("#contacts-search").click(); $("#contacts-search").click();
} }
}); });
@ -242,16 +215,9 @@ $(document).ready(function() {
break; 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 // Add Colorbox for viewing Network page images
//var cBoxClasses = new Array(); //var cBoxClasses = new Array();
$(".wall-item-body a img").each(function(){ $(".wall-item-body a img").each(function() {
var aElem = $(this).parent(); var aElem = $(this).parent();
var imgHref = aElem.attr("href"); var imgHref = aElem.attr("href");
@ -259,16 +225,12 @@ $(document).ready(function() {
// We'll try to do this by looking for links of the form // We'll try to do this by looking for links of the form
// .../photo/ab803d8eg08daf85023adfec08 (with nothing more following), in hopes // .../photo/ab803d8eg08daf85023adfec08 (with nothing more following), in hopes
// that that will be unique enough // 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 // 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"; var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
$(this).addClass(cBoxClass); $(this).addClass(cBoxClass);
// if( $.inArray(cBoxClass, cBoxClasses) < 0 ) {
// cBoxClasses.push(cBoxClass);
// }
aElem.colorbox({ aElem.colorbox({
maxHeight: '90%', maxHeight: '90%',
photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
@ -276,21 +238,13 @@ $(document).ready(function() {
}); });
} }
}); });
/*$.each(cBoxClasses, function(){
$('.'+this).colorbox({
maxHeight: '90%',
photo: true,
rel: this
});
});*/
}); });
// update pending count // // update pending count //
$(function(){ $(function() {
$("nav").bind('nav-update', function(e,data){ $("nav").bind('nav-update', function(e,data) {
var elm = $('#pending-update'); var elm = $('#pending-update');
var register = $(data).find('register').text(); var register = $(data).find('register').text();
if (register=="0") { register=""; elm.hide();} else { elm.show(); } if (register=="0") { register=""; elm.hide();} else { elm.show(); }
@ -299,28 +253,30 @@ $(function(){
}); });
$(function(){ $(function() {
$("#cnftheme").click(function(){ $("#cnftheme").click(function() {
$.colorbox({ $.colorbox({
width: 800, width: 800,
height: '90%', height: '90%',
href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(), href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(),
onComplete: function(){ onComplete: function() {
$("div#fancybox-content form").submit(function(e){ $("div#fancybox-content form").submit(function(e) {
var url = $(this).attr('action'); var url = $(this).attr('action');
// can't get .serialize() to work... // can't get .serialize() to work...
var data={}; var data={};
$(this).find("input").each(function(){ $(this).find("input").each(function() {
data[$(this).attr('name')] = $(this).val(); data[$(this).attr('name')] = $(this).val();
}); });
$(this).find("select").each(function(){ $(this).find("select").each(function() {
data[$(this).attr('name')] = $(this).children(":selected").val(); data[$(this).attr('name')] = $(this).children(":selected").val();
}); });
console.log(":)", url, data); console.log(":)", url, data);
$.post(url, data, function(data) { $.post(url, data, function(data) {
if(timer) clearTimeout(timer); if (timer) {
clearTimeout(timer);
}
NavUpdate(); NavUpdate();
$.colorbox.close(); $.colorbox.close();
}) })
@ -336,18 +292,18 @@ $(function(){
function homeRedirect() { function homeRedirect() {
$('html').fadeOut('slow', function(){ $('html').fadeOut('slow', function() {
window.location = baseurl + "/login"; window.location = baseurl + "/login";
}); });
} }
if(typeof window.photoEdit != 'undefined') { if (typeof window.photoEdit != 'undefined') {
$(document).keydown(function(event) { $(document).keydown(function(event) {
if(window.prevLink != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }} 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.nextLink != '') { if (event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }}
}); });
} }
@ -355,7 +311,7 @@ if(typeof window.photoEdit != 'undefined') {
function showEvent(eventid) { function showEvent(eventid) {
$.get( $.get(
baseurl + window.eventModuleUrl + '/?id=' + eventid, baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){ function(data) {
$.colorbox({html:data}); $.colorbox({html:data});
$.colorbox.resize(); $.colorbox.resize();
} }
@ -396,54 +352,9 @@ 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) { function showNavMenu(menuID) {
if(window.navMenuTimeout[menuID + '-closing']) { if (window.navMenuTimeout[menuID + '-closing']) {
window.navMenuTimeout[menuID + '-closing'] = false; window.navMenuTimeout[menuID + '-closing'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']); clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
} }
@ -459,7 +370,7 @@ function showNavMenu(menuID) {
function hideNavMenu(menuID) { function hideNavMenu(menuID) {
if(window.navMenuTimeout[menuID + '-opening']) { if (window.navMenuTimeout[menuID + '-opening']) {
window.navMenuTimeout[menuID + '-opening'] = false; window.navMenuTimeout[menuID + '-opening'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']); clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
} }
@ -507,11 +418,11 @@ function InitMCEEditor(editorData) {
//setup : // SPECIFIC //setup : // SPECIFIC
}; };
if(window.editSelect != 'none') { if (window.editSelect != 'none') {
$.extend(tinyMCEInitConfig, editorData); $.extend(tinyMCEInitConfig, editorData);
tinyMCE.init(tinyMCEInitConfig); tinyMCE.init(tinyMCEInitConfig);
} }
else if(typeof editorData.plaintextFn == 'function') { else if (typeof editorData.plaintextFn == 'function') {
(editorData.plaintextFn)(); (editorData.plaintextFn)();
} }
} }
@ -519,8 +430,8 @@ function InitMCEEditor(editorData) {
var editor = false; var editor = false;
var textlen = 0; var textlen = 0;
function initEditor(cb){ function initEditor(cb) {
if(editor==false) { if (editor==false) {
editor = true; editor = true;
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
@ -534,26 +445,26 @@ function initEditor(cb){
setup : function(ed) { setup : function(ed) {
cPopup = null; cPopup = null;
ed.onKeyDown.add(function(ed,e) { ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null) if (cPopup !== null)
cPopup.onkey(e); cPopup.onkey(e);
}); });
ed.onKeyUp.add(function(ed, e) { ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent(); var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/); match = txt.match(/@([^ \n]+)$/);
if(match!==null) { if (match!==null) {
if(cPopup === null) { if (cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl"); cPopup = new ACPopup(this,baseurl+"/acl");
} }
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null; if (! cPopup.ready) cPopup = null;
} }
else { else {
if(cPopup !== null) { cPopup.close(); cPopup = null; } if (cPopup !== null) { cPopup.close(); cPopup = null; }
} }
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
else { else {
@ -562,17 +473,17 @@ function initEditor(cb){
//Character count //Character count
if(textlen <= 140) { if (textlen <= 140) {
$('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey'); $('#character-counter').addClass('grey');
} }
if((textlen > 140) && (textlen <= 420)) { if ((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$('#character-counter').addClass('orange'); $('#character-counter').addClass('orange');
} }
if(textlen > 420) { if (textlen > 420) {
$('#character-counter').removeClass('grey'); $('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
$('#character-counter').addClass('red'); $('#character-counter').addClass('red');
@ -608,7 +519,7 @@ function initEditor(cb){
} }
} }
function enableOnUser(){ function enableOnUser() {
if (editor) return; if (editor) return;
$(this).val(""); $(this).val("");
initEditor(); initEditor();
@ -626,26 +537,26 @@ function msgInitEditor() {
setup : function(ed) { setup : function(ed) {
cPopup = null; cPopup = null;
ed.onKeyDown.add(function(ed,e) { ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null) if (cPopup !== null)
cPopup.onkey(e); cPopup.onkey(e);
}); });
ed.onKeyUp.add(function(ed, e) { ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent(); var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/); match = txt.match(/@([^ \n]+)$/);
if(match!==null) { if (match!==null) {
if(cPopup === null) { if (cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl"); cPopup = new ACPopup(this,baseurl+"/acl");
} }
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null; if (! cPopup.ready) cPopup = null;
} }
else { else {
if(cPopup !== null) { cPopup.close(); cPopup = null; } if (cPopup !== null) { cPopup.close(); cPopup = null; }
} }
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} }
else { else {
@ -718,7 +629,7 @@ function profInitEditor() {
*/ */
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') { if (window.editSelect == 'none') {
var currentText = $(textElem).val(); var currentText = $(textElem).val();
$(textElem).val(currentText + data); $(textElem).val(currentText + data);
} }
@ -728,53 +639,22 @@ function addeditortext(textElem, data) {
function jotVideoURL() { function jotVideoURL() {
reply = prompt(window.vidURL); reply = prompt(window.vidURL);
if(reply && reply.length) { if (reply && reply.length) {
addeditortext("#profile-jot-text", '[video]' + reply + '[/video]'); addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
} }
} }
function jotAudioURL() { function jotAudioURL() {
reply = prompt(window.audURL); reply = prompt(window.audURL);
if(reply && reply.length) { if (reply && reply.length) {
addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]'); addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
} }
} }
function jotGetLocation() { 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()); reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) { if (reply && reply.length) {
$('#jot-location').val(reply);
}
}*/
reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) {
$('#jot-location').val(reply); $('#jot-location').val(reply);
} }
} }
@ -785,7 +665,7 @@ function jotShare(id) {
$('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function() {
addeditortext("#profile-jot-text", data); addeditortext("#profile-jot-text", data);
$('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
$(window).scrollTop(0); $(window).scrollTop(0);
@ -802,7 +682,7 @@ function jotClearLocation() {
function jotGetLink() { function jotGetLink() {
reply = prompt(window.linkURL); reply = prompt(window.linkURL);
if(reply && reply.length) { if (reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
@ -815,36 +695,26 @@ function jotGetLink() {
function linkdropper(event) { function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list"); var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound) if (linkFound)
event.preventDefault(); event.preventDefault();
} }
function linkdrop(event) { function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list"); var reply = event.dataTransfer.getData("text/uri-list");
//event.target.textContent = reply;
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if (reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) { $.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); addeditortext(window.jotId, data);
$('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });
} }
else {*/
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
// }
});
}
} }
if(typeof window.geoTag === 'function') window.geoTag(); if (typeof window.geoTag === 'function') window.geoTag();
/* /*
@ -854,14 +724,14 @@ if(typeof window.geoTag === 'function') window.geoTag();
function confirmDelete() { return confirm(window.delItem); } function confirmDelete() { return confirm(window.delItem); }
function deleteCheckedItems(delID) { function deleteCheckedItems(delID) {
if(confirm(window.delItems)) { if (confirm(window.delItems)) {
var checkedstr = ''; var checkedstr = '';
$(delID).hide(); $(delID).hide();
$(delID + '-rotator').show(); $(delID + '-rotator').show();
$('.item-select').each( function() { $('.item-select').each( function() {
if($(this).is(':checked')) { if ($(this).is(':checked')) {
if(checkedstr.length != 0) { if (checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val(); checkedstr = checkedstr + ',' + $(this).val();
} }
else { else {
@ -877,16 +747,14 @@ function deleteCheckedItems(delID) {
function itemTag(id) { function itemTag(id) {
reply = prompt(window.term); reply = prompt(window.term);
if(reply && reply.length) { if (reply && reply.length) {
reply = reply.replace('#',''); reply = reply.replace('#','');
if(reply.length) { if (reply.length) {
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply, NavUpdate); $.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
} }
} }
@ -896,25 +764,23 @@ function itemFiler(id) {
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data) {
$.colorbox({html:data}); $.colorbox({html:data});
$.colorbox.resize(); $.colorbox.resize();
$("#id_term").keypress(function(){ $("#id_term").keypress(function() {
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
$("#select_term").change(function(){ $("#select_term").change(function() {
$("#id_term").css("border-color",bordercolor); $("#id_term").css("border-color",bordercolor);
}) })
$("#filer_save").click(function(e){ $("#filer_save").click(function(e) {
e.preventDefault(); e.preventDefault();
reply = $("#id_term").val(); reply = $("#id_term").val();
if(reply && reply.length) { if (reply && reply.length) {
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate); $.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
$.colorbox.close(); $.colorbox.close();
} else { } else {
@ -1020,13 +886,3 @@ function qCommentInsert(obj,id) {
$("#comment-edit-text-" + id).val(tmpStr + ins); $("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val(""); $(obj).val("");
} }
/*function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) {
$('#comment-edit-form-' + id).hide();
}
else {
$('#comment-edit-form-' + id).show();
}
}*/

27
view/theme/frost/templates/comment_item.tpl
View 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;"> <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;"> <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="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
@ -23,10 +8,7 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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> <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}}"> <ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow" <li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}" style="cursor: pointer;" title="{{$edbold}}"
@ -53,11 +35,9 @@
style="cursor: pointer;" title="{{$edvideo}}" style="cursor: pointer;" title="{{$edvideo}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li> data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
</ul> </ul>
{{*<!-- <div class="comment-edit-bb-end"></div>-->*}}
{{*<!-- <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$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> <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
@ -66,13 +46,10 @@
{{/if}} {{/if}}
<div class="comment-edit-text-end"></div> <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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div> </div>
{{*<!--<div class="comment-edit-end"></div>-->*}}
</form> </form>
</div> </div>

4
view/theme/frost/templates/moderated_comment.tpl
View file

@ -8,7 +8,7 @@
<input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
@ -50,7 +50,7 @@
<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" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<div class="comment-edit-text-end"></div> <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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>

6
view/theme/quattro/templates/comment_item.tpl
View file

@ -8,7 +8,7 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<ul id="comment-edit-bb-{{$id}}" <ul id="comment-edit-bb-{{$id}}"
@ -43,7 +43,7 @@
name="body" name="body"
onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea> onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
@ -51,7 +51,7 @@
</select> </select>
{{/if}} {{/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}}" /> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>

7
view/theme/smoothly/templates/bottom.tpl
View file

@ -5,7 +5,7 @@ $(document).ready(function() {
}); });
function tautogrow(id) { function tautogrow(id) {
$("textarea#comment-edit-text-" + id).autogrow(); $("textarea#comment-edit-text-" + id).autogrow();
}; };
function insertFormatting(comment, BBcode, id) { function insertFormatting(comment, BBcode, id) {
@ -42,12 +42,9 @@ return true;
} }
function cmtBbOpen(id) { function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show(); $(".comment-edit-bb-" + id).show();
} }
function cmtBbClose(id) { function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide(); $(".comment-edit-bb-" + id).hide();
} }
</script> </script>

12
view/theme/smoothly/theme.php
View file

@ -57,16 +57,16 @@ function cmtBbClose(comment, id) {
} }
$(document).ready(function() { $(document).ready(function() {
$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$(this).removeClass('icon'); $(this).addClass('iconspacer');} $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$('.sidebar-group-element').hover( $('.sidebar-group-element').hover(
function() { function() {
id = $(this).attr('id'); id = $(this).attr('id');
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
@ -77,14 +77,14 @@ $('.sidebar-group-element').hover(
); );
$('.savedsearchdrop').hover( $('.savedsearchdrop').hover(
function() { function() {
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() { function() {
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
); );
$('.savedsearchterm').hover( $('.savedsearchterm').hover(
function() { function() {
id = $(this).attr('id'); id = $(this).attr('id');
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
@ -108,7 +108,7 @@ _js_in_foot();
} }
if(! function_exists('_js_in_foot')) { if (! function_exists('_js_in_foot')) {
function _js_in_foot() { function _js_in_foot() {
/** @purpose insert stuff in bottom of page /** @purpose insert stuff in bottom of page
*/ */

6
view/theme/vier/templates/comment_item.tpl
View file

@ -13,13 +13,13 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <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> <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div> </div>
<div class="comment-edit-photo-end"></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" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
{{if $qcomment}} {{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> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
@ -28,7 +28,7 @@
{{/if}} {{/if}}
<div class="comment-edit-text-end"></div> <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"> <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="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>

30
view/theme/vier/theme.php
View file

@ -29,10 +29,10 @@ function vier_init(&$a) {
$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n"; $a->page['htmlhead'] .= '<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"; $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) /// @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'] .= '<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)' /> <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
<script type="text/javascript"> <script type="text/javascript">
@ -66,7 +66,6 @@ function insertFormatting(comment,BBcode,id) {
return true; return true;
} }
function showThread(id) { function showThread(id) {
$("#collapsed-comments-" + id).show() $("#collapsed-comments-" + id).show()
$("#collapsed-comments-" + id + " .collapsed-comments").show() $("#collapsed-comments-" + id + " .collapsed-comments").show()
@ -76,21 +75,16 @@ function hideThread(id) {
$("#collapsed-comments-" + id + " .collapsed-comments").hide() $("#collapsed-comments-" + id + " .collapsed-comments").hide()
} }
function cmtBbOpen(id) { function cmtBbOpen(id) {
$("#comment-edit-bb-" + id).show(); $("#comment-edit-bb-" + id).show();
} }
function cmtBbClose(id) { function cmtBbClose(id) {
$("#comment-edit-bb-" + id).hide(); $("#comment-edit-bb-" + id).hide();
} }
</script> </script>
EOT; EOT;
if ($a->is_mobile || $a->is_tablet){
if ($a->is_mobile || $a->is_tablet){
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -104,13 +98,13 @@ if ($a->is_mobile || $a->is_tablet){
}); });
</script> </script>
EOT; EOT;
} }
// Hide the left menu bar // Hide the left menu bar
if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications", 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' />"; $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
}
} }
function get_vier_config($key, $default = false, $admin = false) { function get_vier_config($key, $default = false, $admin = false) {
@ -142,7 +136,7 @@ function vier_community_info() {
$aside['$url'] = $url; $aside['$url'] = $url;
// comunity_profiles // comunity_profiles
if($show_profiles) { if ($show_profiles) {
$r = suggestion_query(local_user(), 0, 9); $r = suggestion_query(local_user(), 0, 9);
@ -166,7 +160,7 @@ function vier_community_info() {
} }
// last 9 users // last 9 users
if($show_lastusers) { if ($show_lastusers) {
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 "); $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
$order = " ORDER BY `register_date` DESC "; $order = " ORDER BY `register_date` DESC ";
@ -215,11 +209,11 @@ function vier_community_info() {
} }
//Community_Pages at right_aside //Community_Pages at right_aside
if($show_pages AND local_user()) { if ($show_pages AND local_user()) {
require_once('include/ForumManager.php'); require_once('include/ForumManager.php');
if(x($_GET['cid']) && intval($_GET['cid']) != 0) if (x($_GET['cid']) && intval($_GET['cid']) != 0)
$cid = $_GET['cid']; $cid = $_GET['cid'];
//sort by last updated item //sort by last updated item
@ -229,7 +223,7 @@ function vier_community_info() {
$total = count($contacts); $total = count($contacts);
$visible_forums = 10; $visible_forums = 10;
if(count($contacts)) { if (count($contacts)) {
$id = 0; $id = 0;
@ -267,7 +261,7 @@ function vier_community_info() {
//END Community Page //END Community Page
//helpers //helpers
if($show_helpers) { if ($show_helpers) {
$r = array(); $r = array();
$helperlist = get_config("vier", "helperlist"); $helperlist = get_config("vier", "helperlist");