diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-04 22:15:28 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-04 22:15:28 -0500 |
| commit | b34dd1ca713128d958712366140c80e35019a489 (patch) | |
| tree | 22dafb537207f0351aad8cff7656595b1c4ce01a /view/theme/diabook/jot.tpl | |
| parent | efb60e603cb8a76f96f5f5ff491af7e1b46f1bf0 (diff) | |
| parent | d369fcc9945f7e9635f154089d455410fe88495a (diff) | |
| download | volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.tar.gz volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.tar.bz2 volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fixes in diabook
unused replacement variable displays %1 in all html2bbcode 'code' blocks
revup
style.css fix
* master:
Diffstat (limited to 'view/theme/diabook/jot.tpl')
| -rwxr-xr-x | view/theme/diabook/jot.tpl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 4f784c3f8..59066a19c 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -45,23 +45,25 @@ </div> <input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" /> - - <button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button> - + + <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span> + <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang </div> - <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> $jotplugins </div> - + <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> + <div id="profile-jot-perms-end"></div> + <div id="jot-preview-content" style="display:none;"></div> <div style="display: none;"> @@ -75,9 +77,8 @@ </div> -</div> -<div id="profile-jot-end"></div> + </form> </div> {{ if $content }}<script>initEditor();</script>{{ endif }} |