Commit cb7df797 authored by Haakon Meland Eriksen's avatar Haakon Meland Eriksen

Removed my version of jot.tpl

parent 2b2723cb
......@@ -24,4 +24,6 @@ Abstraction of nomadic identity so that sending/receiving to/from singleton netw
CalDAV/CardDAV
E-Commerce
\ No newline at end of file
E-Commerce
Auto Updater
\ No newline at end of file
......@@ -346,6 +346,7 @@ class Item extends BaseObject {
'owner_photo' => $this->get_owner_photo(),
'owner_name' => $this->get_owner_name(),
'photo' => $body['photo'],
'event' => $body['event'],
'has_tags' => $has_tags,
// Item toolbar buttons
......
......@@ -697,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
'thumb' => $profile_avatar,
'title' => $item['title'],
'body' => $body['html'],
'event' => $body['event'],
'photo' => $body['photo'],
'tags' => $body['tags'],
'categories' => $body['categories'],
......
......@@ -153,7 +153,7 @@ function dob($dob) {
* id and name of datetimepicker (defaults to "datetimepicker")
*/
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, '', '');
}
/**
......@@ -168,7 +168,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
* id and name of datetimepicker (defaults to "timepicker")
*/
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);
}
/**
......@@ -198,7 +198,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, $first_day = 0) {
function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false, $first_day = 0) {
$o = '';
$dateformat = '';
......@@ -207,11 +207,11 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
if($pickdate && $picktime) $dateformat .= ' ';
if($picktime) $dateformat .= 'H:i';
$minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
$maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
$minjs = $min->getTimestamp() ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
$maxjs = $max->getTimestamp() ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
$input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : '';
$defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
$input_text = $default->getTimestamp() ? date($dateformat, $default->getTimestamp()) : '';
$defaultdatejs = $default->getTimestamp() ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
$pickers = '';
if(!$pickdate) $pickers .= ',datepicker: false';
......@@ -219,10 +219,10 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
$extra_js = '';
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);
......@@ -231,10 +231,11 @@ 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 .= "<div class='date'><input type='text' placeholder='$readable_format' name='$id' id='$id' $input_text />";
$o .= (($required) ? '<span class="required" title="' . t('Required') . '" >*</span>' : '');
$o .= '</div>';
$o .= "<script type='text/javascript'>\$(function () {var picker = \$('#$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
$tpl = get_markup_template('field_input.tpl');
$o .= replace_macros($tpl,array(
'$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
));
$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
return $o;
}
......
......@@ -21,35 +21,37 @@ function format_event_html($ev) {
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
$o = '<div class="vevent">' . "\r\n";
//todo: move this to template
$o .= '<p class="summary event-summary">' . bbcode($ev['summary']) . '</p>' . "\r\n";
$o = '<div class="vevent">' . "\r\n";
$o .= '<p class="description event-description">' . bbcode($ev['description']) . '</p>' . "\r\n";
$o .= '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($ev['summary']) . '</h3></div>' . "\r\n";
$o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$ev['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format)))
. '</abbr></p>' . "\r\n";
. '</span></div>' . "\r\n";
if(! $ev['nofinish'])
$o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
$o .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
. datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$ev['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format )))
. '</abbr></p>' . "\r\n";
. '</span></div>' . "\r\n";
$o .= '<div class="event-description">' . bbcode($ev['description']) . '</div>' . "\r\n";
if(strlen($ev['location']))
$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">'
$o .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">'
. bbcode($ev['location'])
. '</span></p>' . "\r\n";
. '</span></div>' . "\r\n";
$o .= '</div>' . "\r\n";
......@@ -785,6 +787,12 @@ function event_store_item($arr, $event) {
'type' => ACTIVITY_OBJ_EVENT,
'id' => z_root() . '/event/' . $r[0]['resource_id'],
'title' => $arr['summary'],
'start' => $arr['start'],
'finish' => $arr['finish'],
'nofinish' => $arr['nofinish'],
'description' => $arr['description'],
'location' => $arr['location'],
'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr),
'author' => array(
'name' => $r[0]['xchan_name'],
......@@ -887,7 +895,7 @@ function event_store_item($arr, $event) {
$item_arr['verb'] = ACTIVITY_POST;
$item_arr['item_wall'] = $item_wall;
$item_arr['item_origin'] = $item_origin;
$item_arr['item_thread_top'] = $item_thread_top;;
$item_arr['item_thread_top'] = $item_thread_top;
$attach = array(array(
'href' => z_root() . '/events/ical/' . urlencode($event['event_hash']),
......@@ -924,6 +932,12 @@ function event_store_item($arr, $event) {
'type' => ACTIVITY_OBJ_EVENT,
'id' => z_root() . '/event/' . $event['event_hash'],
'title' => $arr['summary'],
'start' => $arr['start'],
'finish' => $arr['finish'],
'nofinish' => $arr['nofinish'],
'description' => $arr['description'],
'location' => $arr['location'],
'adjust' => $arr['adjust'],
'content' => format_event_bbcode($arr),
'author' => array(
'name' => $x[0]['xchan_name'],
......
......@@ -5,6 +5,7 @@
require_once("include/template_processor.php");
require_once("include/smarty.php");
require_once("include/bbcode.php");
// random string, there are 86 characters max in text mode, 128 for hex
// output is urlsafe
......@@ -1413,9 +1414,55 @@ function prepare_body(&$item,$attach = false) {
}
}
$event = array();
$is_event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? true : false);
if($is_event) {
$object = json_decode($item['object'],true);
//ensure compatibility with older items
if(array_key_exists('description', $object)) {
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
$event['header'] = '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($object['title']) . '</h3></div>' . "\r\n";
$event['header'] .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. datetime_convert('UTC', 'UTC', $object['start'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$object['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$object['start'] , $bd_format)))
. '</span></div>' . "\r\n";
if(! $object['nofinish'])
$event['header'] .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
. datetime_convert('UTC','UTC',$object['finish'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$object['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$object['finish'] , $bd_format )))
. '</span></div>' . "\r\n";
$event['content'] = '<div class="event-description">' . bbcode($object['description']) . '</div>' . "\r\n";
if(strlen($object['location']))
$event['content'] .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">'
. bbcode($object['location'])
. '</span></div>' . "\r\n";
}
else {
$is_event = false;
}
}
$prep_arr = array(
'item' => $item,
'html' => $s,
'html' => $is_event ? $event['content'] : $s,
'event' => $event['header'],
'photo' => $photo
);
......@@ -1423,6 +1470,7 @@ function prepare_body(&$item,$attach = false) {
$s = $prep_arr['html'];
$photo = $prep_arr['photo'];
$event = $prep_arr['event'];
// q("update item set html = '%s' where id = %d",
// dbesc($s),
......@@ -1489,6 +1537,7 @@ function prepare_body(&$item,$attach = false) {
'item' => $item,
'photo' => $photo,
'html' => $s,
'event' => $event,
'categories' => $categories,
'folders' => $filer,
'tags' => $tags,
......
......@@ -33,7 +33,7 @@ function editpost_content(&$a) {
}
if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
goaway(z_root() . '/events/event/' . $itm[0]['resource_id']);
goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
}
......
This diff is collapsed.
......@@ -39,6 +39,7 @@ function update_channel_content(&$a) {
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -50,6 +51,7 @@ function update_channel_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
/**
* reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
......
......@@ -20,7 +20,7 @@ function update_display_content(&$a) {
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -32,7 +32,7 @@ function update_display_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
......
......@@ -16,7 +16,7 @@ function update_home_content(&$a) {
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -28,7 +28,7 @@ function update_home_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
echo str_replace("\t",' ',$text);
echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
......
......@@ -18,7 +18,7 @@ function update_network_content(&$a) {
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -30,7 +30,7 @@ function update_network_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
echo str_replace("\t",' ',$text);
echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
......
......@@ -16,7 +16,7 @@ function update_public_content(&$a) {
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -28,7 +28,7 @@ function update_public_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
echo str_replace("\t",' ',$text);
echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
......
......@@ -41,7 +41,7 @@ function update_search_content(&$a) {
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
// $text = preg_replace($pattern, $replace, $text);
/*
if(! $load) {
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
......@@ -53,7 +53,7 @@ function update_search_content(&$a) {
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
}
*/
/**
* reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
*/
......
2015-11-23.1225
2015-11-25.1227
......@@ -178,7 +178,6 @@ a.wall-item-name-link {
/* comment_item */
.comment-edit-text-empty, .comment-edit-text-full {
float: left;
width: 100%;
}
......@@ -246,3 +245,18 @@ a.wall-item-name-link {
color: #FF0000;
font-size: 1em !important;
}
/* event item */
.event-title h3 {
margin: 0px 0px 10px 0px;
font-weight: bold;
}
.event-description {
padding-bottom: 10px;
}
.event-label {
font-weight: bold;
}
......@@ -4,57 +4,7 @@
margin-bottom: -1px;
}
#event-desc-textarea, #event-location-textarea {
width: 400px;
}
#event-summary-text, #event-start-text, #event-finish-text {
width: 200px;
float: left;
}
#event-summary, #start_text {
width: 95%;
float: left;
}
#finish_text {
width: 100%;
float: left;
}
#event-category-wrap {
margin-top: 15px;
}
.event-cats {
margin-top: 15px;
}
.bootstrap-tagsinput {
width: 100%;
padding: 6px 12px;
}
.required {
float: left;
cursor: default;
}
#event-datetime-break {
clear: both;
}
#event-nofinish-break {
margin-bottom: 10px;
}
#event-desc-text, #event-location-text, .event-form-location-end {
margin-top: 15px;
}
#event-edit-preview-btn {
margin-right: 15px;
}
......@@ -81,7 +81,7 @@ $a->config['system']['php_path'] = '{{$phpath}}';
// Configure how we communicate with directory servers.
// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
// DIRECTORY_MODE_SECONDARY = caching directory or mirror
// DIRECTORY_MODE_PRIMARY = main directory server
// DIRECTORY_MODE_PRIMARY = master directory server - one per realm
// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
......
This diff is collapsed.
This diff is collapsed.
......@@ -60,7 +60,7 @@ function contact_format(item) {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
return "<div class='{0}' title='{4}'><img class='dropdown-menu-img-sm' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
}
else
return "<div>" + item.text + "</div>";
......
......@@ -2,33 +2,15 @@
* JavaScript for mod/events
*/
$(document).ready( function() { showHideFinishDate(); });
$(document).ready( function() {
function showHideFinishDate() {
enableDisableFinishDate();
});
function enableDisableFinishDate() {
if( $('#id_nofinish').is(':checked'))
$('#event-finish-wrapper').hide();
$('#id_finish_text').prop("disabled", true);
else
$('#event-finish-wrapper').show();
}
function eventGetStart() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#startModal').modal();
$('#start-modal-OKButton').on('click', function() {
reply=$('#start-date').val();
if(reply && reply.length) {
$('#start-text').val(reply);
$('#startModal').modal('hide');
}
});
$('#id_finish_text').prop("disabled", false);
}
function eventGetFinish() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#finishModal').modal();
$('#finish-modal-OKButton').on('click', function() {
reply=$('#finish-date').val();
if(reply && reply.length) {
$('#finish-text').val(reply);
$('#finishModal').modal('hide');
}
});
}
\ No newline at end of file
......@@ -857,57 +857,22 @@ nav .acpopup {
border-color: #ccc !important;
}
.eventcal {
float: left;
font-size: 20px;
}
#event-summary-text {
margin-top: 15px;
}
#event-share-checkbox {
float: left;
margin-top: 10px;
}
#event-share-text {
float: left;
margin-top: 10px;
margin-left: 5px;
}
#event-share-break {
clear: both;
margin-bottom: 10px;
}
.event-wrapper {
width: 400px;
height: auto;
.wall-event-item {
padding: 10px;
color: #fff;
background-color: #3A87AD; /* should reflect calendar color */
border-top-left-radius: $radiuspx;
border-top-right-radius: $radiuspx;
}
.vevent {
max-width: 100%;
margin: 10px;
padding: 10px;
border: 1px solid #CCCCCC;
.vevent .event-end {
padding-bottom: 10px;
}
.vevent .event-summary {
margin: 10px;
font-weight: bold;
#event-summary-text {
margin-top: 15px;
}
.vevent .event-description, .vevent .event-location {
margin-left: 10px;
margin-right: 10px;
}
.vevent .event-start {
margin-left: 10px;
margin-right: 10px;
}
#new-event-link {
margin-bottom: 10px;
......@@ -920,29 +885,13 @@ nav .acpopup {
margin-bottom: 15px;
}
.event-description:before {
content: url('../../../../images/calendar.png');
margin-right: 15px;
}
.event-start, .event-end {
margin-left: 10px;
width: 300px;
clear: both;
}
.event-owner img {
padding: 10px;
padding-bottom: 10px;
padding-right: 10px;
}
.event-buttons {
margin-top: 10px;
margin-left: 10px;
}
.event-start .dtstart, .event-end .dtend {
float: right;
margin-right: 10px;
}
.event-list-date {
......@@ -959,14 +908,6 @@ nav .acpopup {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
.today {
font-weight: bold;
color: #FF0000;
}
#cboxOverlay {
z-index: 1050;
......@@ -1123,31 +1064,6 @@ nav .acpopup {
color: #ff0000;
}
#event-start-text, #event-finish-text {
margin-top: 10px;
margin-bottom: 5px;
}
#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
float: left;
}
#event-datetime-break {
margin-bottom: 10px;
}
#event-nofinish-break, #event-adjust-break {
clear: both;
}
#event-desc-text, #event-location-text {
margin-top: 15px;
margin-bottom: 5px;
}
#event-submit {
margin-top: 10px;
}
#item-delete-selected {
margin-top: 30px;
}
......@@ -2340,3 +2256,4 @@ nav .badge.mail-update:hover {
.response-list ul {
list-style-type: none;
}
......@@ -13,6 +13,11 @@
{{$item.photo}}
</div>
{{/if}}
{{if $item.event}}
<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
{{$item.event}}
</div>
{{/if}}
<div class="wall-item-head">
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
......
......@@ -13,6 +13,11 @@
{{$item.photo}}
</div>
{{/if}}
{{if $item.event}}
<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
{{$item.event}}
</div>
{{/if}}
<div class="wall-item-head">
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
......
{{foreach $events as $event}}
<div class="event-wrapper">
<div class="event">
<div class="event-owner">
{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="64" width="64" />{{$event.item.author.xchan_name}}</a>{{/if}}
</div>
{{$event.html}}
<div class="event-buttons">
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil btn btn-default"></i></a>{{/if}}
{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="icon-trash btn btn-default"></i></a>{{/if}}
</div>