aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-08 19:59:26 -0700
committerfriendica <info@friendica.com>2014-05-08 19:59:26 -0700
commit22b79207f9c30ce54d65e134303bd179ea21b377 (patch)
tree157f733bebbde8e5365461e770f6825f25eb30f9
parent4cf684a701fcf175bf2104bef66f91ac7549818f (diff)
downloadvolse-hubzilla-22b79207f9c30ce54d65e134303bd179ea21b377.tar.gz
volse-hubzilla-22b79207f9c30ce54d65e134303bd179ea21b377.tar.bz2
volse-hubzilla-22b79207f9c30ce54d65e134303bd179ea21b377.zip
event form hard-wired tinymce=on, made selectable
-rwxr-xr-xmod/events.php13
-rw-r--r--view/css/mod_events.css3
-rwxr-xr-xview/tpl/event_form.tpl1
-rwxr-xr-xview/tpl/event_head.tpl5
4 files changed, 18 insertions, 4 deletions
diff --git a/mod/events.php b/mod/events.php
index d243f61ba..8bf8c6ce1 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -158,8 +158,17 @@ function events_content(&$a) {
}
+ $plaintext = true;
+
+ if(feature_enabled(local_user(),'richtext'))
+ $plaintext = false;
+
+
$htpl = get_markup_template('event_head.tpl');
- $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+ $a->page['htmlhead'] .= replace_macros($htpl,array(
+ '$baseurl' => $a->get_baseurl(),
+ '$editselect' => (($plaintext) ? 'none' : 'textareas')
+ ));
$o ="";
// tabs
@@ -400,7 +409,6 @@ function events_content(&$a) {
if($orig_event['event_xchan'])
$sh_checked .= ' disabled="disabled" ';
- $tpl = get_markup_template('event_form.tpl');
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
@@ -439,6 +447,7 @@ function events_content(&$a) {
'deny_gid' => $channel['channel_deny_gid']
);
+ $tpl = get_markup_template('event_form.tpl');
$o .= replace_macros($tpl,array(
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
new file mode 100644
index 000000000..657eff082
--- /dev/null
+++ b/view/css/mod_events.css
@@ -0,0 +1,3 @@
+#event-desc-textarea, #event-location-textarea {
+ width: 400px;
+} \ No newline at end of file
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index da4dda82e..eaf3f74fe 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -36,6 +36,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() {