aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--view/theme/dispy-dark/head.tpl24
-rw-r--r--view/theme/dispy-dark/jot-header.tpl3
-rw-r--r--view/theme/dispy-dark/jot.tpl2
-rw-r--r--view/theme/dispy-dark/nets.tpl2
-rw-r--r--view/theme/dispy-dark/saved_searches_aside.tpl6
-rw-r--r--view/theme/dispy-dark/search_item.tpl43
-rw-r--r--view/theme/dispy-dark/wall_item.tpl15
-rw-r--r--view/theme/dispy-dark/wallwall_item.tpl52
-rw-r--r--view/theme/dispy/communityhome.tpl2
-rw-r--r--view/theme/dispy/head.tpl24
-rw-r--r--view/theme/dispy/jot-header.tpl3
-rw-r--r--view/theme/dispy/jot.tpl2
-rw-r--r--view/theme/dispy/nets.tpl2
-rw-r--r--view/theme/dispy/profile_vcard.tpl4
-rw-r--r--view/theme/dispy/saved_searches_aside.tpl6
-rw-r--r--[-rwxr-xr-x]view/theme/dispy/search_item.tpl43
-rw-r--r--view/theme/dispy/style.css19
-rw-r--r--view/theme/dispy/wall_item.tpl15
-rw-r--r--view/theme/dispy/wallwall_item.tpl52
19 files changed, 188 insertions, 131 deletions
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
@@ -34,14 +34,16 @@
function commentOpen(obj,id) {
if(obj.value == '$comment') {
obj.value = '';
- obj.className = "comment-edit-text-full";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = '$comment';
- obj.className="comment-edit-text-empty";
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
closeMenu("comment-edit-submit-wrapper-" + id);
}
}
@@ -63,6 +65,22 @@
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
+ function qCommentInsert(obj,id) {
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == '$comment') {
+ tmpStr = '';
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ }
+ var ins = $(obj).val();
+ ins = ins.replace('&lt;','<');
+ ins = ins.replace('&gt;','>');
+ ins = ins.replace('&amp;','&');
+ ins = ins.replace('&quot;','"');
+ $("#comment-edit-text-" + id).val(tmpStr + ins);
+ }
+
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 92eccf740..5838729cc 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -9,6 +9,7 @@ function initEditor(cb) {
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+ $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic',
@@ -30,6 +31,7 @@ function initEditor(cb) {
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,
@@ -296,7 +298,6 @@ function enableOnUser(){
}
-
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl
index 94c31da23..688ac1451 100644
--- a/view/theme/dispy-dark/jot.tpl
+++ b/view/theme/dispy-dark/jot.tpl
@@ -11,7 +11,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
-
+ <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
</textarea>
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b322717ad..b0cb8890c 100644
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
- <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index 63a85dda5..fb822fe5d 100644
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<div class="widget" id="saved-search-list">
<h3 id="search">$title</h3>
$searchbox
<ul id="saved-search-ul">
{{ for $saved as $search }}
<li class="saved-search-li clear">
- <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
- <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+ <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+ <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
</li>
{{ endfor }}
</ul>
diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl
index 54c3e389c..bfad1b7b7 100644
--- a/view/theme/dispy-dark/search_item.tpl
+++ b/view/theme/dispy-dark/search_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
@@ -14,11 +14,21 @@
</div>
</div>
<div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+ </div>
</div>
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -27,25 +37,18 @@
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
- </div>
-
</div>
<div class="wall-item-wrapper-end"></div>
-</div>
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
<div class="wall-item-conv" id="wall-item-conv-$item.id" >
{{ if $item.conv }}
- <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+ <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
{{ endif }}
</div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index b54f753d3..8acaeaf02 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -1,10 +1,12 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+ </a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
@@ -16,10 +18,10 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
@@ -69,7 +71,6 @@
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index b25d13409..421cddadf 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -22,43 +22,46 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ <div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
-
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-
- {{ if $item.vote.share }}
- <a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
- {{ endif }}
+ <ul class="wall-item-subtools1">
+ {{ if $item.star }}
+ <li>
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+ </li>
+ {{ endif }}
+ {{ if $item.vote }}
+ <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+ </li>
+ {{ endif }}
+ </ul><br style="clear:left;" />
+ <ul class="wall-item-subtools2">
{{ if $item.filer }}
- <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+ <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
{{ endif }}
{{ if $item.plink }}
- <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+ <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ endif }}
{{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
{{ endif }}
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ </li>
+ </ul>
<div class="wall-item-delete-end"></div>
-
</div>
<div class="wall-item-content" id="wall-item-content-$item.id" >
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ endfor }}
</div>
</div>
-
</div>
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 2876f936e..340b7216c 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -37,8 +37,10 @@
</div>
{{ endif }}
+{{ if $lastusers_title }}
<h3 id="postit-header">PostIt to Friendica</h3>
<div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div>
+{{ endif }}
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
@@ -34,14 +34,16 @@
function commentOpen(obj,id) {
if(obj.value == '$comment') {
obj.value = '';
- obj.className = "comment-edit-text-full";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = '$comment';
- obj.className="comment-edit-text-empty";
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
closeMenu("comment-edit-submit-wrapper-" + id);
}
}
@@ -63,6 +65,22 @@
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
+ function qCommentInsert(obj,id) {
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == '$comment') {
+ tmpStr = '';
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ }
+ var ins = $(obj).val();
+ ins = ins.replace('&lt;','<');
+ ins = ins.replace('&gt;','>');
+ ins = ins.replace('&amp;','&');
+ ins = ins.replace('&quot;','"');
+ $("#comment-edit-text-" + id).val(tmpStr + ins);
+ }
+
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 92eccf740..5838729cc 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -9,6 +9,7 @@ function initEditor(cb) {
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+ $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic',
@@ -30,6 +31,7 @@ function initEditor(cb) {
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,
@@ -296,7 +298,6 @@ function enableOnUser(){
}
-
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index 94c31da23..688ac1451 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -11,7 +11,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
-
+ <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
</textarea>
diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl
index b322717ad..b0cb8890c 100644
--- a/view/theme/dispy/nets.tpl
+++ b/view/theme/dispy/nets.tpl
@@ -4,7 +4,7 @@
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
- <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index 350a6ce4a..f14ea7915 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -10,9 +10,8 @@
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
</li>
{{ endfor }}
- <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+ <li><a href="profile_photo">$profile.menu.chg_photo</a></li>
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-
</ul>
</div>
{{ endif }}
@@ -81,4 +80,3 @@
$contact_block
-
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
index 63a85dda5..fb822fe5d 100644
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ b/view/theme/dispy/saved_searches_aside.tpl
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<div class="widget" id="saved-search-list">
<h3 id="search">$title</h3>
$searchbox
<ul id="saved-search-ul">
{{ for $saved as $search }}
<li class="saved-search-li clear">
- <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
- <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+ <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+ <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
</li>
{{ endfor }}
</ul>
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 54c3e389c..bfad1b7b7 100755..100644
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
@@ -14,11 +14,21 @@
</div>
</div>
<div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+ </div>
</div>
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -27,25 +37,18 @@
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
- </div>
-
</div>
<div class="wall-item-wrapper-end"></div>
-</div>
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
<div class="wall-item-conv" id="wall-item-conv-$item.id" >
{{ if $item.conv }}
- <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+ <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
{{ endif }}
</div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index f4c080182..3799563ff 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -2085,6 +2085,9 @@ div[id$="wrapper"] br {
float:left;
font-size:20px;
}
+.event {
+ background: #2e2f2e;
+}
.vevent {
border:1px solid #ccc;
}
@@ -2096,15 +2099,14 @@ div[id$="wrapper"] br {
margin-left: 10px;
margin-right: 10px;
}
-
#new-event-link {
margin-bottom: 10px;
}
.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
+ /*float: left; */
+ /*margin-top: 4px; */
+ /*margin-right: 4px;*/
+ /*margin-bottom: 15px;*/
}
.event-description:before {
content: url('../../../images/calendar.png');
@@ -2113,6 +2115,7 @@ div[id$="wrapper"] br {
.event-start, .event-end {
margin-left: 10px;
width: 330px;
+ font-size: smaller;
}
.event-start .dtstart, .event-end .dtend {
float: right;
@@ -2187,7 +2190,7 @@ div[id$="wrapper"] br {
opacity: 0.1;
filter:alpha(opacity=10);
float: right;
- margin-right: 10px;
+ margin-right: 5px;
}
.item-select:hover, .checkeditem {
opacity: 1;
@@ -2213,6 +2216,10 @@ div[id$="wrapper"] br {
#item-delete-selected-desc:hover {
text-decoration: underline;
}
+.fc-state-highlight {
+ background: #eec;
+ color: #2e2f2e;
+}
/**
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index b54f753d3..8acaeaf02 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -1,10 +1,12 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+ </a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
@@ -16,10 +18,10 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
- <div class="wall-item-lock-wrapper">
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
+ <div class="wall-item-lock-wrapper">
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ </div>
<ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
@@ -69,7 +71,6 @@
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
</div>
</div>
<div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index b25d13409..421cddadf 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -22,43 +22,46 @@
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
- <div class="wall-item-lock-wrapper">
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ <div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
-
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-
- {{ if $item.vote.share }}
- <a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
- {{ endif }}
+ <ul class="wall-item-subtools1">
+ {{ if $item.star }}
+ <li>
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+ </li>
+ {{ endif }}
+ {{ if $item.vote }}
+ <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+ </li>
+ {{ endif }}
+ </ul><br style="clear:left;" />
+ <ul class="wall-item-subtools2">
{{ if $item.filer }}
- <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+ <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
{{ endif }}
{{ if $item.plink }}
- <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+ <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ endif }}
{{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
{{ endif }}
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ </li>
+ </ul>
<div class="wall-item-delete-end"></div>
-
</div>
<div class="wall-item-content" id="wall-item-content-$item.id" >
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ endfor }}
</div>
</div>
-
</div>
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:36:01 +0000