harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen 2015-11-29 11:56:47 +01:00
commit 519862115c
7 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/events.php
View File

@ -434,22 +434,22 @@ function events_content(&$a) {
'$xchan' => $event_xchan,
'$mid' => $mid,
'$event_hash' => $event_id,
'$summary' => array('summary', t('Event Title'), $t_orig, t('Required'), '*'),
'$summary' => array('summary', (($event_id) ? t('Edit event titel') : t('Event titel')), $t_orig, t('Required'), '*'),
'$catsenabled' => $catsenabled,
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$c_text' => t('Category'),
'$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
'$category' => $category,
'$required' => '<span class="required" title="' . t('Required') . '">*</span>',
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"), t('Start date and time'), 'start_text',true,true,'','',true,$first_day),
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text',true,true,'','',true,$first_day),
'$n_text' => t('Finish date and time are not known or not relevant'),
'$n_checked' => $n_checked,
'$f_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$fyear+5),DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"), t('Finish date and time'),'finish_text',true,true,'start_text','',false,$first_day),
'$f_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$fyear+5),DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')),'finish_text',true,true,'start_text','',false,$first_day),
'$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'),t('Yes')), 'onclick="enableDisableFinishDate();"'),
'$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'),t('Yes'))),
'$a_text' => t('Adjust for viewer timezone'),
'$d_text' => t('Description'),
'$d_text' => (($event_id) ? t('Edit Description') : t('Description')),
'$d_orig' => $d_orig,
'$l_text' => t('Location'),
'$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
'$l_orig' => $l_orig,
'$t_orig' => $t_orig,
'$sh_text' => t('Share this event'),
@ -648,7 +648,7 @@ function events_content(&$a) {
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$new_event' => array($a->get_baseurl().'/events/new',t('New Event'),'',''),
'$new_event' => array($a->get_baseurl().'/events',(($event_id) ? t('Edit Event') : t('Create Event')),'',''),
'$previus' => array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$export' => array($a->get_baseurl()."/events/$y/$m/export",t('Export'),'',''),

2
version.inc
View File

@ -1 +1 @@
2015-11-27.1229
2015-11-28.1230

20
view/css/conversation.css
View File

@ -248,12 +248,32 @@ a.wall-item-name-link {
/* event item */
.event-item-title h3 {
margin: 0px 0px 10px 0px;
font-weight: bold;
}
.event-item-description {
padding-bottom: 10px;
}
.event-item-label {
font-weight: bold;
}
/* vevent */
.event-title h3 {
margin: 0px 0px 10px 0px;
font-weight: bold;
}
.vevent {
padding-top: 10px;
}
.event-description {
padding-top: 10px;
padding-bottom: 10px;
}

20
view/css/mod_events.css
View File

@ -24,29 +24,21 @@
padding: 6px 12px;
}
.event-wrapper {
.event-wrapper,
.vevent {
max-width: 700px;
height: auto;
padding: 10px;
}
.event-owner {
margin-bottom: 15px;
padding: 10px;
}
.event-owner img {
margin-right: 5px;
}
.event-buttons,
.event-description {
margin-top: 10px;
.vevent,
.event-buttons {
padding: 10px;
}
#event-upload-form {
margin-top: 10px;
}
#event-upload-choose {
width: 100%;
}

9
view/css/widgets.css
View File

@ -124,3 +124,12 @@ li:hover .group-edit-icon {
width: 250px;
}
/* events tools */
#event-upload-form {
margin-top: 10px;
}
#event-upload-choose {
width: 100%;
}

6
view/tpl/event_item_content.tpl
View File

@ -1,10 +1,10 @@
{{if $description}}
<div class="event-description">
<div class="event-item-description">
{{$description}}
</div>
{{/if}}
{{if $location}}
<div class="event-location">
<span class="event-label">{{$location_label}}</span>&nbsp;<span class="event_location">{{$location}}</span>
<div class="event-item-location">
<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
</div>
{{/if}}

10
view/tpl/event_item_header.tpl
View File

@ -1,11 +1,11 @@
<div class="event-title">
<div class="event-item-title">
<h3><i class="icon-calendar"></i>&nbsp;{{$title}}</h3>
</div>
<div class="event-start">
<span class="event-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
<div class="event-item-start">
<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
</div>
{{if $finish}}
<div class="event-start">
<span class="event-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
<div class="event-item-start">
<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
</div>
{{/if}}