diff options
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 14 | ||||
| -rw-r--r-- | include/template_processor.php | 2 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/php/theme.php | 9 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/tpl/comment_item.tpl | 66 | ||||
| -rw-r--r-- | view/tpl/comment_item.tpl | 32 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 5 |
9 files changed, 47 insertions, 87 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index e55c61433..89e8dd3bc 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -556,7 +556,7 @@ class Item extends BaseObject { '$edimg' => t('Image'), '$edurl' => t('Link'), '$edvideo' => t('Video'), - '$preview' => t('Preview'), + '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), '$indent' => $indent, '$sourceapp' => t($a->sourcename), '$ww' => (($conv->get_mode() === 'network') ? $ww : '') diff --git a/include/conversation.php b/include/conversation.php index 13b6c566c..e9e550a12 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1655,7 +1655,7 @@ function format_like($cnt,$arr,$type,$id) { }} -function status_editor($a,$x, $notes_cid = 0, $popup=false) { +function status_editor($a,$x,$popup=false) { $o = ''; @@ -1688,16 +1688,9 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $jotplugins = ''; $jotnets = ''; - $catsenabled = feature_enabled($x['profile_uid'],'categories'); - call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); - if($notes_cid) - $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />'; - - $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); - $o .= replace_macros($tpl,array( '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', @@ -1718,7 +1711,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), - '$catsenabled' => $catsenabled, + '$catsenabled' => ((feature_enabled($x['profile_uid'],'categories')) ? 'categories' : ''), '$category' => "", '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), @@ -1738,8 +1731,9 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$acl' => $x['acl'], '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], - '$preview' => t('Preview'), + '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''), '$sourceapp' => t($a->sourcename), + '$jotplugins' => $jotplugins, )); diff --git a/include/template_processor.php b/include/template_processor.php index 0f52d12a4..89f03dfe0 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -71,7 +71,7 @@ $val = $this->_get_var($args[2]); } $x = preg_split("|{{ *else *}}|", $args[3]); - return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : "")); + return ( ($val) ? $x[0] : (isset($x[1]) ? $x[1] : "")); } /** @@ -225,7 +225,7 @@ if(strlen($a->module)) { /** * load current theme info */ -$theme_info_file = "view/theme/".current_theme()."/theme.php"; +$theme_info_file = "view/theme/".current_theme()."/php/theme.php"; if (file_exists($theme_info_file)){ require_once($theme_info_file); } diff --git a/mod/display.php b/mod/display.php index 6a9f2a996..68d4204b2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -118,7 +118,7 @@ function display_content(&$a) { 'visitor' => 'block', 'profile_uid' => local_user() ); - $o .= status_editor($a,$x,0,true); + $o .= status_editor($a,$x,true); $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); diff --git a/view/theme/duepuntozero/php/theme.php b/view/theme/duepuntozero/php/theme.php index a1d436a4b..462fca7ed 100644 --- a/view/theme/duepuntozero/php/theme.php +++ b/view/theme/duepuntozero/php/theme.php @@ -42,12 +42,13 @@ function cmtBbOpen(comment, id) { return false; } function cmtBbClose(comment, id) { - if($(comment).hasClass('comment-edit-text-empty')) { - $(".comment-edit-bb-" + id).hide(); - return true; - } +// if($(comment).hasClass('comment-edit-text-empty')) { +// $(".comment-edit-bb-" + id).hide(); +// return true; +// } return false; } + $(document).ready(function() { $('.group-edit-icon').hover( diff --git a/view/theme/duepuntozero/tpl/comment_item.tpl b/view/theme/duepuntozero/tpl/comment_item.tpl deleted file mode 100755 index f64ae753b..000000000 --- a/view/theme/duepuntozero/tpl/comment_item.tpl +++ /dev/null @@ -1,66 +0,0 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - {{ if $threaded }} - <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;"> - {{ else }} - <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - {{ endif }} - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <ul class="comment-edit-bb-$id"> - <li><a class="editicon boldbb shadow" - style="cursor: pointer;" title="$edbold" - onclick="insertFormatting('$comment','b', $id);"></a></li> - <li><a class="editicon italicbb shadow" - style="cursor: pointer;" title="$editalic" - onclick="insertFormatting('$comment','i', $id);"></a></li> - <li><a class="editicon underlinebb shadow" - style="cursor: pointer;" title="$eduline" - onclick="insertFormatting('$comment','u', $id);"></a></li> - <li><a class="editicon quotebb shadow" - style="cursor: pointer;" title="$edquote" - onclick="insertFormatting('$comment','quote', $id);"></a></li> - <li><a class="editicon codebb shadow" - style="cursor: pointer;" title="$edcode" - onclick="insertFormatting('$comment','code', $id);"></a></li> - <li><a class="editicon imagebb shadow" - style="cursor: pointer;" title="$edimg" - onclick="insertFormatting('$comment','img', $id);"></a></li> - <li><a class="editicon urlbb shadow" - style="cursor: pointer;" title="$edurl" - onclick="insertFormatting('$comment','url', $id);"></a></li> - <li><a class="editicon videobb shadow" - style="cursor: pointer;" title="$edvideo" - onclick="insertFormatting('$comment','video', $id);"></a></li> - </ul> - <div class="comment-edit-bb-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea> - {{ if $qcomment }} - <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > - <option value=""></option> - {{ for $qcomment as $qc }} - <option value="$qc">$qc</option> - {{ endfor }} - </select> - {{ endif }} - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > - <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> - <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> - <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 3de24ca8d..cc7153ebb 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,12 +10,40 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> </div> <div class="comment-edit-photo-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> + <ul class="comment-edit-bb-$id"> + <li><a class="editicon boldbb shadow" + style="cursor: pointer;" title="$edbold" + onclick="insertFormatting('$comment','b', $id);"></a></li> + <li><a class="editicon italicbb shadow" + style="cursor: pointer;" title="$editalic" + onclick="insertFormatting('$comment','i', $id);"></a></li> + <li><a class="editicon underlinebb shadow" + style="cursor: pointer;" title="$eduline" + onclick="insertFormatting('$comment','u', $id);"></a></li> + <li><a class="editicon quotebb shadow" + style="cursor: pointer;" title="$edquote" + onclick="insertFormatting('$comment','quote', $id);"></a></li> + <li><a class="editicon codebb shadow" + style="cursor: pointer;" title="$edcode" + onclick="insertFormatting('$comment','code', $id);"></a></li> + <li><a class="editicon imagebb shadow" + style="cursor: pointer;" title="$edimg" + onclick="insertFormatting('$comment','img', $id);"></a></li> + <li><a class="editicon urlbb shadow" + style="cursor: pointer;" title="$edurl" + onclick="insertFormatting('$comment','url', $id);"></a></li> + <li><a class="editicon videobb shadow" + style="cursor: pointer;" title="$edvideo" + onclick="insertFormatting('$comment','video', $id);"></a></li> + </ul> + <div class="comment-edit-bb-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> @@ -28,8 +56,10 @@ <div class="comment-edit-text-end"></div> <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + {{ if $preview }} <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> + {{ endif }} </div> <div class="comment-edit-end"></div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c702fafaf..29c420900 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -53,13 +53,14 @@ <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang </div> - <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span> + {{ if $preview }}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>{{ endif }} + <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> - $jotplugins + $jotplugins </div> <div id="profile-rotator-wrapper" style="display: $visitor;" > |