diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
| commit | edb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch) | |
| tree | 18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /view/tpl | |
| parent | 2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff) | |
| parent | f2171173fe2c9a0596672da293eb756a514ff789 (diff) | |
| download | volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2 volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/uexport.tpl | 15 |
2 files changed, 12 insertions, 6 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 49369ab63..7e12c6bb3 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -3,6 +3,7 @@ var editor = false; var textlen = 0; var plaintext = '{{$editselect}}'; +var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ @@ -21,6 +22,8 @@ function initEditor(cb){ }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); + if(pretext.length) + addeditortext(pretext); return; } tinyMCE.init({ diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index 5de995ba0..b9a1b9572 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -1,9 +1,12 @@ <div class="generic-content-wrapper"> -<h1>{{$title}}</h1> -<b><a href="uexport/basic">{{$basictitle}}</a></b></p> -<p>{{$basic}}</p> - -<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> -<p>{{$full}}</p> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <b><a href="uexport/basic">{{$basictitle}}</a></b></p> + <p>{{$basic}}</p> + <p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> + <p>{{$full}}</p> + </div> </div> |