Merge branch 'pull'

[friendica.git] / view / theme / testbubble / jot.tpl

diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
old mode 100644 (file)
new mode 100755 (executable)
index d60e8ad..e2fd713
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -9,13 +9,14 @@
        </div>
 
        <form id="profile-jot-form" action="$action" method="post" >
-               <input type="hidden" name="type" value="wall" />
+               <input type="hidden" name="type" value="$ptyp" />
                <input type="hidden" name="profile_uid" value="$profile_uid" />
                <input type="hidden" name="return" value="$return_path" />
                <input type="hidden" name="location" id="jot-location" value="$defloc" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="title" id="jot-title" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
+               <input type="hidden" name="preview" id="jot-preview" value="0" />
+               <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
 
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -30,9 +31,6 @@
        <div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
                <a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
        </div> 
-       <div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
-               <a id="profile-youtube" class="icon border  youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
-       </div> 
        <div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
                <a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
        </div> 
@@ -45,9 +43,8 @@
        <div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
                <a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
        </div> 
-       <div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-               <a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-       </div> 
+
+       <span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >$preview</span>
 
        <div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
                <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
@@ -60,6 +57,8 @@
        </div>
        <div id="profile-jot-tools-end"></div>
        
+       <div id="jot-preview-content" style="display:none;"></div>
+
         <div style="display: none;">
             <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
                 $acl