diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/jot.tpl | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/jot.tpl')
| -rwxr-xr-x | view/tpl/jot.tpl | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 32a08a9b3..026c586a0 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,5 +1,12 @@ -<div id="profile-jot-wrapper"> - <form id="profile-jot-form" action="{{$action}}" method="post"> +<form id="profile-jot-form" action="{{$action}}" method="post"> + {{$mimeselect}} + {{$layoutselect}} + {{if $id_select}} + <div class="channel-id-select-div"> + <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} + </div> + {{/if}} + <div id="profile-jot-wrapper"> {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} @@ -17,13 +24,7 @@ <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> {{if $showacl}}{{$acl}}{{/if}} - {{$mimeselect}} - {{$layoutselect}} - {{if $id_select}} - <div class="channel-id-select-div"> - <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} - </div> - {{/if}} + {{if $webpage}} <div id="jot-pagetitle-wrap" class="jothidden"> <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> @@ -47,6 +48,7 @@ {{/if}} <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> + {{if $bbcode}} <div class="btn-group"> <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="icon-bold jot-icons"></i> @@ -64,6 +66,7 @@ <i class="icon-terminal jot-icons"></i> </button> </div> + {{/if}} {{if $visitor}} <div class="btn-group hidden-xs"> {{if $writefiles}} @@ -159,9 +162,10 @@ </div> <div id="profile-jot-text-loading"></div> <div id="profile-jot-end" class="clear"></div> - <div id="jot-preview-content" style="display:none;"></div> - </form> -</div> + </div> +</form> + +<div id="jot-preview-content" style="display:none;"></div> <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> |