Merge https://github.com/friendica/friendica into pull

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

diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl
index e7a89d8e074619cdfbef8a16b35c5bb522794930..ae3ab1d3ba9d131b477511183538d881acc256e7 100644 (file)
--- a/view/theme/frost/jot.tpl
+++ b/view/theme/frost/jot.tpl
@@ -14,8 +14,11 @@
                <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" />
+               <input type="hidden" name="post_id_random" value="$rand_num" />
                <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+               {{ if $placeholdercategory }}
                <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
+               {{ endif }}
                <div id="jot-text-wrap">
                <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>
@@ -24,6 +27,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
        <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
 
+       <div id="profile-rotator-wrapper" style="display: $visitor;" >
+               <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+       </div> 
+       
        <div id="profile-upload-wrapper" style="display: $visitor;" >
                <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
        </div> 
@@ -62,10 +69,6 @@
 
 <!--   <span id="jot-display-location" style="display: none;"></span>-->
 
-       <div id="profile-rotator-wrapper" style="display: $visitor;" >
-               <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-       </div> 
-       
        <div id="jot-preview-content" style="display:none;"></div>
 
        <div style="display: none;">