Fix undefined tamplate variables in comment_item.tpl

- Remove unused "type" hidden field in comment form
- Remove unused moderated_comment.tpl files

diff --git a/include/conversation.php b/include/conversation.php
index 0a8f5cfc313902de2cca66c3e961f0e9106a3823..57d368e927b9723ff16ca4191e26b2fe8db72837 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1212,6 +1212,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                '$edimg'        => DI::l10n()->t('Image'),
                '$edurl'        => DI::l10n()->t('Link'),
                '$edattach'     => DI::l10n()->t('Link or Media'),
+               '$edvideo'      => DI::l10n()->t('Video'),
                '$setloc'       => DI::l10n()->t('Set your location'),
                '$shortsetloc'  => DI::l10n()->t('set location'),
                '$noloc'        => DI::l10n()->t('Clear browser location'),

diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl
index 977a5b75b2663eb49f86f80c9c3513b5ced23103..856637e26cea840dded78e78d3a25323ba3b82d6 100644 (file)
--- a/view/templates/comment_item.tpl
+++ b/view/templates/comment_item.tpl
@@ -5,7 +5,6 @@
                <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
                {{/if}}
                        <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-                               <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
                                <input type="hidden" name="parent" value="{{$parent}}" />
                                {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

diff --git a/view/templates/moderated_comment.tpl b/view/templates/moderated_comment.tpl
deleted file mode 100644 (file)
index 39dbbde..0000000
--- a/view/templates/moderated_comment.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-               <div class="comment-wwedit-wrapper" 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;">
-                               <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}}" />
-
-                               <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 id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-                                       <div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-                                       <div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-                                       <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-                               </div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
-
-                               <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-                                       <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/theme/duepuntozero/templates/comment_item.tpl b/view/theme/duepuntozero/templates/comment_item.tpl
index cd14b253c5efe3641ee3e1eedb758ce02a7a9fc3..1d416fdf1afa93ec3e18e4a2789e99d5061ccccc 100644 (file)
--- a/view/theme/duepuntozero/templates/comment_item.tpl
+++ b/view/theme/duepuntozero/templates/comment_item.tpl
@@ -5,7 +5,6 @@
                <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
                {{/if}}
                        <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-                               <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
                                <input type="hidden" name="parent" value="{{$parent}}" />
                                {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

diff --git a/view/theme/duepuntozero/templates/moderated_comment.tpl b/view/theme/duepuntozero/templates/moderated_comment.tpl
deleted file mode 100644 (file)
index 197d128..0000000
--- a/view/theme/duepuntozero/templates/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-               <div class="comment-wwedit-wrapper" 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;">
-                               <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}}" />
-
-                               <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 id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
-                                       <div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
-                                       <div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
-                                       <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
-                               </div>
-                               <ul class="comment-edit-bb-{{$id}}">
-                                       <li><a class="editicon boldbb shadow"
-                                               style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('b', {{$id}});"></a></li>
-                                       <li><a class="editicon italicbb shadow"
-                                               style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('i', {{$id}});"></a></li>
-                                       <li><a class="editicon underlinebb shadow"
-                                               style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('u', {{$id}});"></a></li>
-                                       <li><a class="editicon quotebb shadow"
-                                               style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('quote', {{$id}});"></a></li>
-                                       <li><a class="editicon codebb shadow"
-                                               style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('code', {{$id}});"></a></li>
-                                       <li><a class="editicon imagebb shadow"
-                                               style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('img', {{$id}});"></a></li>
-                                       <li><a class="editicon urlbb shadow"
-                                               style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('url', {{$id}});"></a></li>
-                                       <li><a class="editicon videobb shadow"
-                                               style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('video', {{$id}});"></a></li>
-                               </ul>
-                               <div class="comment-edit-bb-end"></div>
-                               <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
-
-                               <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-                                       <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/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index d4284d39b8ce33d0b574abb659396402a8e80e3d..aab6aee94388976bed2899de1eed27d3d56bcd21 100644 (file)
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -5,7 +5,6 @@
 <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}">
 {{/if}}
        <form class="comment-edit-form" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post">
-               <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}}" />-->*}}

diff --git a/view/theme/quattro/templates/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl
index 1fa4e333ed7bd46c6b904f906f0526610b3111b6..cb6f4ad2fffcc8e70a62f31490722978bb60bc5c 100644 (file)
--- a/view/theme/quattro/templates/comment_item.tpl
+++ b/view/theme/quattro/templates/comment_item.tpl
@@ -1,6 +1,5 @@
                <div class="comment-wwedit-wrapper" 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;">
-                               <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}}" />-->*}}

diff --git a/view/theme/vier/templates/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl
index 0e2cbb5bbfe01d7b099ce5e3ae31fe990e5b6d57..ef48ac7ef237eebc98204579f7eca6a18fa1d75d 100644 (file)
--- a/view/theme/vier/templates/comment_item.tpl
+++ b/view/theme/vier/templates/comment_item.tpl
@@ -5,7 +5,6 @@
                <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
                {{/if}}
                        <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-                               <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
                                <input type="hidden" name="parent" value="{{$parent}}" />
                                {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}