diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
| commit | 264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (patch) | |
| tree | 883418e21b721217b28380f9313405373825650a /view/tpl/jot.tpl | |
| parent | e084a85e79af2c56f6e715fcf44a1be815ea5c45 (diff) | |
| parent | a0baa480e3968306c8ebc297a60f84b4d2ccf8c9 (diff) | |
| download | volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.gz volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.bz2 volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/jot.tpl')
| -rwxr-xr-x | view/tpl/jot.tpl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 32a08a9b3..631f55d83 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,3 +1,10 @@ +{{$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"> <form id="profile-jot-form" action="{{$action}}" method="post"> {{if $parent}} @@ -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}}"> @@ -159,10 +160,11 @@ </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 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"> <div class="modal-dialog"> |