diff options
| author | marijus <mario@mariovavti.com> | 2014-05-09 07:39:27 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-05-09 07:39:27 +0200 |
| commit | 56eb9e75ccad49c8fcbd569b097c2ea85e7d258f (patch) | |
| tree | 87411ce648195b34f0a02ed49d60b007a6a8470d /view/tpl | |
| parent | 6e397240a3f1a1bb52ef5d9bd3929a6770ac8222 (diff) | |
| parent | 831b18cf283cd52fd1b01d6c6c4648b8351985a7 (diff) | |
| download | volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.tar.gz volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.tar.bz2 volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/event_form.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index da4dda82e..bfdf4d0b6 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -13,14 +13,18 @@ <div id="event-start-text">{{$s_text}}</div> {{$s_dsel}} {{$s_tsel}} +<div class="clear"></div><br /> + +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> + +<div id="event-nofinish-break"></div> + + <div id="event-finish-text">{{$f_text}}</div> {{$f_dsel}} {{$f_tsel}} <div id="event-datetime-break"></div> -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> - -<div id="event-nofinish-break"></div> <input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div> @@ -36,6 +40,7 @@ <div id="event-location-text">{{$l_text}}</div> <textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea> +<br /> <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <div id="event-share-break"></div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index b55025f65..e698c8c97 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -73,7 +73,7 @@ }); </script> - +{{if $editselect != 'none'}} <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> @@ -81,7 +81,7 @@ tinyMCE.init({ theme : "advanced", - mode : "textareas", + mode : "{{$editselect}}", plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", @@ -107,6 +107,7 @@ }); + {{/if}} $(document).ready(function() { |