+
[code=php]function text_highlight($s,$lang)[/code]+ +
- function text_highlight($s,$lang)
+
[quote]quote[/quote]
quotediff --git a/doc/de/BBCode.md b/doc/de/BBCode.md index cd9fa7673..d852a4a4f 100644 --- a/doc/de/BBCode.md +++ b/doc/de/BBCode.md @@ -42,6 +42,12 @@ Block Tags
+
[code=php]function text_highlight($s,$lang)[/code]+ +
- function text_highlight($s,$lang)
+
[quote]Zitat[/quote]
Zitatdiff --git a/include/bbcode.php b/include/bbcode.php index 84425e8ef..359a7ba2f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -724,6 +724,13 @@ function bb_CleanPictureLinks($text) { return ($text); } +function bb_highlight($match) { + if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', + 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) + return text_highlight($match[2],strtolower($match[1])); + return $match[0]; +} + // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica - Mike Macgirvin @@ -776,6 +783,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal if (!$tryoembed) $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text); + // Check for [code] text here, before the linefeeds are messed with. + // The highlighter will unescape and re-escape the content. + if (strpos($Text,'[code=') !== false) { + $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text); + } // Convert new line chars to html
tags // nlbr seems to be hopelessly messed up diff --git a/include/datetime.php b/include/datetime.php index e27f54e09..ea98f01fe 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -213,7 +213,7 @@ function dob($dob) { * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { - return datetimesel($format,$min,$max,$default,$id,true,false, '',''); + return datetimesel($format,$min,$max,$default,'',$id,true,false, '',''); } /** @@ -231,7 +231,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * @return string Parsed HTML output. */ function timesel($format, $h, $m, $id='timepicker') { - return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),$id,false,true); + return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true); } /** @@ -262,7 +262,7 @@ function timesel($format, $h, $m, $id='timepicker') { * @todo Once browser support is better this could probably be replaced with * native HTML5 date picker. */ -function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) { +function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) { // First day of the week (0 = Sunday) $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); @@ -284,7 +284,7 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; - $input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : ''; + $input_text = $default ? date($dateformat, $default->getTimestamp()) : ''; $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; @@ -294,9 +294,9 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; if($minfrom != '') - $extra_js .= "\$('#$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; + $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; if($maxfrom != '') - $extra_js .= "\$('#$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; + $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -305,10 +305,13 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic $readable_format = str_replace('H','HH',$readable_format); $readable_format = str_replace('i','MM',$readable_format); - $o .= "
";
- $o .= '
';
+ $tpl = get_markup_template('field_input.tpl');
+ $o .= replace_macros($tpl,array(
+ '$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
+ ));
+
$o .= "";
return $o;
diff --git a/include/event.php b/include/event.php
index c5e5ff18d..df9b95857 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1,7 +1,12 @@
$firstDay,
+ "Sun" => t("Sun"),
+ "Mon" => t("Mon"),
+ "Tue" => t("Tue"),
+ "Wed" => t("Wed"),
+ "Thu" => t("Thu"),
+ "Fri" => t("Fri"),
+ "Sat" => t("Sat"),
+ "Sunday" => t("Sunday"),
+ "Monday" => t("Monday"),
+ "Tuesday" => t("Tuesday"),
+ "Wednesday" => t("Wednesday"),
+ "Thursday" => t("Thursday"),
+ "Friday" => t("Friday"),
+ "Saturday" => t("Saturday"),
+ "Jan" => t("Jan"),
+ "Feb" => t("Feb"),
+ "Mar" => t("Mar"),
+ "Apr" => t("Apr"),
+ "May" => t("May"),
+ "Jun" => t("Jun"),
+ "Jul" => t("Jul"),
+ "Aug" => t("Aug"),
+ "Sep" => t("Sept"),
+ "Oct" => t("Oct"),
+ "Nov" => t("Nov"),
+ "Dec" => t("Dec"),
+ "January" => t("January"),
+ "February" => t("February"),
+ "March" => t("March"),
+ "April" => t("April"),
+ "May" => t("May"),
+ "June" => t("June"),
+ "July" => t("July"),
+ "August" => t("August"),
+ "September" => t("September"),
+ "October" => t("October"),
+ "November" => t("November"),
+ "December" => t("December"),
+ "today" => t("today"),
+ "month" => t("month"),
+ "week" => t("week"),
+ "day" => t("day"),
+ );
+
+ return $i18n;
+}
+
+/**
+ * @brief Get an event by its event ID
+ *
+ * @param type $owner_uid The User ID of the owner of the event
+ * @param type $event_params An assoziative array with
+ * int 'event_id' => The ID of the event in the event table
+ * @param type $sql_extra
+ * @return array Query result
+ */
+function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
+ // ownly allow events if there is a valid owner_id
+ if($owner_uid == 0)
+ return;
+
+ // query for the event by event id
+ $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
+ `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+ LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+ WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
+ intval($owner_uid),
+ intval($event_params["event_id"])
+ );
+
+ if(count($r))
+ return $r;
+
+}
+
+/**
+ * @brief Get all events in a specific timeframe
+ *
+ * @param int $owner_uid The User ID of the owner of the events
+ * @param array $event_params An assoziative array with
+ * int 'ignored' =>
+ * string 'start' => Start time of the timeframe
+ * string 'finish' => Finish time of the timeframe
+ * string 'adjust_start' =>
+ * string 'adjust_start' =>
+ *
+ * @param string $sql_extra Additional sql conditions (e.g. permission request)
+ * @return array Query results
+ */
+function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
+ // ownly allow events if there is a valid owner_id
+ if($owner_uid == 0)
+ return;
+
+ // query for the event by date
+ $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
+ `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+ LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+ WHERE `event`.`uid` = %d AND event.ignore = %d
+ AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
+ OR (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s'))
+ $sql_extra ",
+ intval($owner_uid),
+ intval($event_params["ignored"]),
+ dbesc($event_params["start"]),
+ dbesc($event_params["start"]),
+ dbesc($event_params["finish"]),
+ dbesc($event_params["adjust_start"]),
+ dbesc($event_params["adjust_start"]),
+ dbesc($event_params["adjust_finish"])
+ );
+
+ if(count($r))
+ return $r;
+}
+
+/**
+ * @brief Convert an array query results in an arry which could be used by the events template
+ *
+ * @param array $arr Event query array
+ * @return array Event array for the template
+ */
+function process_events ($arr) {
+ $events=array();
+
+ $last_date = '';
+ $fmt = t('l, F j');
+ if (count($arr)) {
+ foreach($arr as $rr) {
+
+ $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
+ $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
+ $d = day_translate($d);
+
+ $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
+ if ($rr['nofinish']){
+ $end = null;
+ } else {
+ $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+ }
+
+
+ $is_first = ($d !== $last_date);
+
+ $last_date = $d;
+ $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
+ $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+ if(! $title) {
+ list($title, $_trash) = explode("' . $o . '');
+}
diff --git a/library/Text_Highlighter/README b/library/Text_Highlighter/README
new file mode 100644
index 000000000..88f71aed2
--- /dev/null
+++ b/library/Text_Highlighter/README
@@ -0,0 +1,455 @@
+# $Id$
+
+Introduction
+============
+
+Text_Highlighter is a class for syntax highlighting. The main idea is to
+simplify creation of subclasses implementing syntax highlighting for
+particular language. Subclasses do not implement any new functioanality, they
+just provide syntax highlighting rules. The rules sources are in XML format.
+To create a highlighter for a language, there is no need to code a new class
+manually. Simply describe the rules in XML file and use Text_Highlighter_Generator
+to create a new class.
+
+
+This document does not contain a formal description of API - it is very
+simple, and I believe providing some examples of code is sufficient.
+
+
+Highlighter XML source
+======================
+
+Basics
+------
+
+Creating a new syntax highlighter begins with describing the highlighting
+rules. There are two basic elements: block and region. A block is just a
+portion of text matching a regular expression and highlighted with a single
+color. Keyword is an example of a block. A region is defined by two regular
+expressions: one for start of region, and another for the end. The main
+difference from a block is that a region can contain blocks and regions
+(including same-named regions). An example of a region is a group of
+statements enclosed in curly brackets (this is used in many languages, for
+example PHP and C). Also, characters matching start and end of a region may be
+highlighted with their own color, and region contents with another.
+
+Blocks and regions may be declared as contained. Contained blocks and regions
+can only appear inside regions. If a region or a block is not declared as
+contained, it can appear both on top level and inside regions. Block or region
+declared as not-contained can only appear on top level.
+
+For any region, a list of blocks and regions that can appear inside this
+region can be specified.
+
+In this document, the term "color group" is used. Chunks of text assigned to
+same color group will be highlighted with same color. Note that in versions
+prior 0.5.0 color goups were refered as CSS classes, but since 0.5.0 not only
+HTML output is supported, so "color group" is more appropriate term.
+
+Elements
+--------
+
+The toplevel element is
+ *require_once 'Text/Highlighter.php';
+ *$hlSQL = Text_Highlighter::factory('SQL',array('numbers'=>true));
+ *echo $hlSQL->highlight('SELECT * FROM table a WHERE id = 12');
+ *
+ *
+ * @author Andrey Demenev {{$s_text}}
{{$s_dsel}}
-{{$f_text}}
{{$f_dsel}}
-
+{{include file="field_checkbox.tpl" field=$nofinish}}
- {{$n_text}}
+{{include file="field_checkbox.tpl" field=$adjust}}
-
-
- {{$a_text}}
-
-
-
-{{$t_text}}
-
+{{include file="field_input.tpl" field=$summary}}
{{$d_text}}
@@ -41,8 +32,9 @@
-
-
+{{if ! $eid}}
+{{include file="field_checkbox.tpl" field=$share}}
+{{/if}}
{{$acl}}
diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
index de5ad6070..99a320a89 100644
--- a/view/templates/event_head.tpl
+++ b/view/templates/event_head.tpl
@@ -6,7 +6,7 @@
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index b4f82aca4..70add44c2 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -7,6 +7,7 @@
+
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index dc892c60b..bfce21a65 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -163,6 +163,15 @@ a#item-delete-selected {
.btn-link:focus, .btn-link:hover {
color: #23527c;
}
+.btn-eventnav, btn-eventnav:hover {
+ font-size: 16px;
+ background: none;
+ background-color: transparent;
+ padding: 0 14px;
+}
+.btn-separator {
+ border-left: 1px solid #777;
+}
/*.btn-info {
background: #6fdbe8;
color: #fff!important;
@@ -1760,8 +1769,8 @@ ul.dropdown-menu li:hover {
.contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper,
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
-.events-content-wrapper, .message-content-wrapper, .apps-content-wrapper,
-.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
+.message-content-wrapper, .apps-content-wrapper, .notifications-content-wrapper,
+.admin-content-wrapper, .group-content-wrapper {
min-height: calc(100vh - 150px);
padding: 15px;
padding-bottom: 20px;
@@ -1960,6 +1969,78 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
clear: both;
}
+/* Events page */
+#fc-header {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+#fc-header-left,
+#fc-header-right,
+#event-calendar-title {
+ display: inline-block;
+}
+#fc-title {
+ margin: 0;
+ padding-left: 20px;
+
+}
+#fc-header-right {
+ margin-top: -4px;
+}
+#event-calendar-title {
+ vertical-align: middle;
+}
+a#event-calendar-views {
+ padding: 6px 9px;
+ font-size: 14px
+}
+tr.fc-first,
+tr.fc-first th {
+ border-left: none;
+ border-right: none;
+ border-top: none;
+}
+td.fc-day {
+ border-left: none;
+ border-right: none;
+ padding: 0 6px;
+}
+#events-calendar .fc-grid .fc-day-number {
+ float: left;
+ font-size: 0.9em;
+}
+.event-wrapper .event-owner {
+ margin-bottom: 15px;
+}
+.event-wrapper .event-owner img {
+ display: block;
+}
+.event-owner img {
+ margin-right: 5px;
+ height: 48px;
+ width: 48;
+ border-radius: 3px;
+}
+.event-wrapper .vevent {
+ margin-left: 0;
+ margin-right: 0;
+ box-shadow: 1.5px 0 0 0 rgba(0, 0, 0, .1) inset;
+}
+.event-wrapper .event-buttons {
+ margin-top: 15px;
+}
+#event-form-wrapper {
+ padding-top: 5px;
+}
+#event-edit-form-wrapper {
+ padding-top: 15px;
+}
+#event-nav a {
+ color: #555;
+}
+#event-edit-form-wrapper #event-edit-time {
+ padding: 10px 0;
+}
/* Profiles Page */
.profile-listing-table {
display: table;
diff --git a/view/theme/frio/js/event.js b/view/theme/frio/js/event.js
new file mode 100644
index 000000000..c6a3541f6
--- /dev/null
+++ b/view/theme/frio/js/event.js
@@ -0,0 +1,124 @@
+$(document).ready(function() {
+ // go to the permissions tab if the checkbox is checked
+ $('body').on("change", "#id_share", function() {
+
+ if ($('#id_share').is(':checked') && !( $('#id_share').attr("disabled"))) {
+ $('#acl-wrapper').show();
+ $("a#event-perms-lnk").parent("li").show();
+ toggleEventNav("a#event-perms-lnk");
+ eventAclActive();
+ }
+ else {
+ $('#acl-wrapper').hide();
+ $("a#event-perms-lnk").parent("li").hide();
+ }
+ }).trigger('change');
+
+ // disable the finish time input if the user disable it
+ $('body').on("change", "#id_nofinish", function() {
+ enableDisableFinishDate()
+ }).trigger('change');
+
+ // js for the permission sextion
+ $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+ var selstr;
+ $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+ selstr = $(this).text();
+ $('#jot-public').hide();
+ });
+ if(selstr == null) {
+ $('#jot-public').show();
+ }
+
+ }).trigger('change');
+
+ // Change the event nav menu.tabs on click
+ $("body").on("click", "#event-nav > li > a", function(e){
+ e.preventDefault();
+ toggleEventNav(this);
+ });
+
+ // this is experimental. We maybe can make use of it to inject
+ // some js code while the event modal opens
+ //$('body').on('show.bs.modal', function () {
+ // enableDisableFinishDate();
+ //});
+
+ // clear some elements (e.g. the event-preview container) when
+ // selecting a event nav link so it don't appear more than once
+ $('body').on("click", "#event-nav a", function(e) {
+ $("#event-preview").empty();
+ e.preventDefault();
+ });
+
+});
+
+// Load the html of the actual event and incect the output to the
+// event-edit section
+function doEventPreview() {
+ $('#event-edit-preview').val(1);
+ $.post('events',$('#event-edit-form').serialize(), function(data) {
+ $("#event-preview").append(data);
+ });
+ $('#event-edit-preview').val(0);
+}
+
+
+// this function load the content of the edit url into a modal
+function eventEdit(url) {
+ var char = qOrAmp(url);
+ url = url + char + 'mode=none';
+
+ $.get(url, function(data) {
+ $("#modal-body").empty();
+ $("#modal-body").append(data);
+ }).done(function() {
+ loadModalTitle();
+ });
+}
+
+// the following functions show/hide the specific event-edit content
+// in dependence of the selected nav
+function eventAclActive() {
+ $("#event-edit-wrapper, #event-preview, #event-desc-wrapper").hide();
+ $("#event-acl-wrapper").show();
+}
+
+
+function eventPreviewActive() {
+ $("#event-acl-wrapper, #event-edit-wrapper, #event-desc-wrapper").hide();
+ $("#event-preview").show();
+ doEventPreview();
+}
+
+function eventEditActive() {
+ $("#event-acl-wrapper, #event-preview, #event-desc-wrapper").hide();
+ $("#event-edit-wrapper").show();
+
+ //make sure jot text does have really the active class (we do this because there are some
+ // other events which trigger jot text
+ toggleEventNav($("#event-edit-lnk"));
+}
+
+function eventDescActive() {
+ $("#event-edit-wrapper, #event-preview, #event-acl-wrapper").hide();
+ $("#event-desc-wrapper").show();
+}
+
+// Give the active "event-nav" list element the class "active"
+function toggleEventNav (elm) {
+ // select all li of #event-nav and remove the active class
+ $(elm).closest("#event-nav").children("li").removeClass("active");
+ // add the active class to the parent of the link which was selected
+ $(elm).parent("li").addClass("active");
+}
+
+
+
+// disable the input for the finish date if it is not available
+function enableDisableFinishDate() {
+ if( $('#id_nofinish').is(':checked'))
+ $('#id_finish_text').prop("disabled", true);
+ else
+ $('#id_finish_text').prop("disabled", false);
+}
diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index fcaaadcc7..0279b1c72 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -158,13 +158,22 @@ Dialog._load = function(url) {
*/
function loadModalTitle() {
// clear the text of the title
- //$("#modal-title").empty();
+ $("#modal-title").empty();
// hide the first element with the class "heading" of the modal body
$("#modal-body .heading").first().hide();
+ var title = "";
+
// get the text of the first element with "heading" class
- var title = $("#modal-body .heading").first().text();
+ title = $("#modal-body .heading").first().text();
+
+ // for event modals we need some speacial handling
+ if($("#modal-body .event-wrapper .event-summary").length) {
+ title = ' ';
+ var eventsum = $("#modal-body .event-wrapper .event-summary").text();
+ title = title + eventsum;
+ }
// and append it to modal title
if (title!=="") {
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 8babb0805..f2537f487 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -505,4 +505,3 @@ String.prototype.rtrim = function() {
var trimmed = this.replace(/\s+$/g, '');
return trimmed;
};
-
diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
new file mode 100644
index 000000000..32e740581
--- /dev/null
+++ b/view/theme/frio/templates/event.tpl
@@ -0,0 +1,26 @@
+
+
+{{foreach $events as $event}}
+
+
+{{/foreach}}
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
new file mode 100644
index 000000000..97892d186
--- /dev/null
+++ b/view/theme/frio/templates/event_form.tpl
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+ {{if $event.item.author_name}}
+ 
+ {{$event.item.author_name}}
+ {{/if}}
+
+
+ {{$event.html}}
+
+
+
+
+
\ No newline at end of file
diff --git a/view/theme/frio/templates/event_head.tpl b/view/theme/frio/templates/event_head.tpl
new file mode 100644
index 000000000..4d14a3884
--- /dev/null
+++ b/view/theme/frio/templates/event_head.tpl
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+{{if $editselect != 'none'}}
+
+
diff --git a/view/theme/frio/templates/events-js.tpl b/view/theme/frio/templates/events-js.tpl
new file mode 100644
index 000000000..9e46b5c48
--- /dev/null
+++ b/view/theme/frio/templates/events-js.tpl
@@ -0,0 +1,49 @@
+{{$title}}
+ + {{* The event edit navigation menu (text input, permissions, preview, filebrowser) *}} + + +
+
+
+
+ {{$tabs}}
+ {{include file="section_title.tpl" title=$title}}
+
+ {{* The link to create a new event *}}
+
+
+ {{* We create our own fullcallendar header (with title & calendar view *}}
+
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 57148736d..72d7cbf07 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -12,6 +12,7 @@
+
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 7d7e8259c..3017263b6 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -156,7 +156,7 @@ $(document).ready(function() {
if(window.aclType == "event_head") {
$('#events-calendar').fullCalendar({
- events: baseurl + '/events/json/',
+ events: baseurl + window.eventModuleUrl +'/json/',
header: {
left: 'prev,next today',
center: 'title',
@@ -204,9 +204,11 @@ $(document).ready(function() {
// center on date
var args=location.href.replace(baseurl,"").split("/");
- if (args.length>=4) {
+ if (args.length>=5 && window.eventModeParams == 2) {
+ $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
+ } else if (args.length>=4 && window.eventModeParams == 1) {
$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
- }
+ }
// show event popup
var hash = location.hash.split("-")
@@ -264,7 +266,7 @@ function initCrop() {
function showEvent(eventid) {
/* $.get(
- baseurl + '/events/?id='+eventid,
+ baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){
$.colorbox({html:data});
}
diff --git a/view/theme/frost-mobile/templates/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl
index 11c8f99fb..ccd88f6c8 100644
--- a/view/theme/frost-mobile/templates/event_head.tpl
+++ b/view/theme/frost-mobile/templates/event_head.tpl
@@ -3,5 +3,7 @@
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index fc1bb643c..eb8bb51cc 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -70,9 +70,9 @@ $(document).ready(function() {
return false;
});*/
- $('#event-share-checkbox').change(function() {
+ $('#id_share').change(function() {
- if ($('#event-share-checkbox').is(':checked')) {
+ if ($('#id_share').is(':checked')) {
$('#acl-wrapper').show();
}
else {
@@ -149,7 +149,7 @@ $(document).ready(function() {
if(window.aclType == "event_head") {
$('#events-calendar').fullCalendar({
- events: baseurl + '/events/json/',
+ events: baseurl + window.eventModuleUrl +'/json/',
header: {
left: 'prev,next today',
center: 'title',
@@ -202,10 +202,12 @@ $(document).ready(function() {
// center on date
var args=location.href.replace(baseurl,"").split("/");
- if (args.length>=4) {
+ if (args.length>=5 && window.eventModeParams == 2) {
+ $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1);
+ } else if (args.length>=4 && window.eventModeParams == 1) {
$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
- }
-
+ }
+
// show event popup
var hash = location.hash.split("-")
if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
@@ -352,7 +354,7 @@ if(typeof window.photoEdit != 'undefined') {
function showEvent(eventid) {
$.get(
- baseurl + '/events/?id='+eventid,
+ baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){
$.colorbox({html:data});
$.colorbox.resize();
diff --git a/view/theme/frost/templates/event_form.tpl b/view/theme/frost/templates/event_form.tpl
index 43f2a782f..27631d9f7 100644
--- a/view/theme/frost/templates/event_form.tpl
+++ b/view/theme/frost/templates/event_form.tpl
@@ -12,24 +12,15 @@
-
+
+
+ {{* This is the container where the fullCalendar is inserted through js *}}
+
+
+ {{* The dropdown to change the callendar view *}}
+
+
+
+ {{* The buttons to change the month/weeks/days *}}
+
+
+
+
+
+
+ {{* The title (e.g. name of the mont/week/day) *}}
+
+
+
{{$s_text}}
{{$s_dsel}}
-{{$f_text}}
{{$f_dsel}}
-
+{{include file="field_checkbox.tpl" field=$nofinish}}
- {{$n_text}}
+{{include file="field_checkbox.tpl" field=$adjust}}
-
-
- {{$a_text}}
-
-
-
-{{$t_text}}
-
+{{include file="field_input.tpl" field=$summary}}
{{$d_text}}
@@ -40,8 +31,9 @@
- - +{{if ! $eid}} +{{include file="field_checkbox.tpl" field=$share}} +{{/if}} {{$acl}} diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl index f33f7fce2..47efb56ae 100644 --- a/view/theme/frost/templates/event_head.tpl +++ b/view/theme/frost/templates/event_head.tpl @@ -4,5 +4,7 @@ diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl index 098b57850..484fe6744 100644 --- a/view/theme/quattro/templates/event_form.tpl +++ b/view/theme/quattro/templates/event_form.tpl @@ -10,23 +10,23 @@ - {{include file="field_custom.tpl" field=array('start_text', $s_text, $s_dsel, "")}} - {{include file="field_custom.tpl" field=array('finish_text', $f_text, $f_dsel, "")}} + {{$s_dsel}} - {{include file="field_checkbox.tpl" field=array('nofinish', $n_text, $n_checked, "")}} - {{include file="field_checkbox.tpl" field=array('adjust', $a_text, $a_checked, "")}} + {{$f_dsel}} + + {{include file="field_checkbox.tpl" field=$nofinish}} + + {{include file="field_checkbox.tpl" field=$adjust}}
- {{include file="field_input.tpl" field=array('summary', $t_text, $t_orig, "")}} + {{include file="field_input.tpl" field=$summary}} {{include file="field_textarea.tpl" field=array('desc', $d_text, $d_orig, "")}} {{include file="field_textarea.tpl" field=array('location', $l_text, $l_orig, "")}}
- + {{if ! $eid}} + {{include file="field_checkbox.tpl" field=$share}} + {{/if}} {{$acl}} diff --git a/view/theme/vier/templates/event_form.tpl b/view/theme/vier/templates/event_form.tpl index 4f3240de8..0507c36aa 100644 --- a/view/theme/vier/templates/event_form.tpl +++ b/view/theme/vier/templates/event_form.tpl @@ -13,24 +13,15 @@ -
{{$s_text}}
{{$s_dsel}}
-{{$f_text}}
{{$f_dsel}}
-
+{{include file="field_checkbox.tpl" field=$nofinish}}
- {{$n_text}}
+{{include file="field_checkbox.tpl" field=$adjust}}
-
-
- {{$a_text}}
-
-
-
-{{$t_text}}
-
+{{include file="field_input.tpl" field=$summary}}
{{$d_text}}
@@ -61,8 +52,9 @@
-
-
+{{if ! $eid}}
+{{include file="field_checkbox.tpl" field=$share}}
+{{/if}}
{{$acl}}