clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change event behaviour so that title is required but description is not

This commit is contained in:
friendica 2012-06-25 21:20:08 -07:00
parent fbaca4b742
commit 359a98cd22
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/bbcode.php
View File

@ -302,8 +302,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$sub = format_event_html($ev); $sub = format_event_html($ev);
$Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text);
$Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",$sub,$Text); $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text);
$Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",'',$Text); $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text);
$Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text); $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
$Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text); $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
$Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);

12
mod/events.php
View File

@ -62,8 +62,8 @@ function events_post(&$a) {
$location = escape_tags(trim($_POST['location'])); $location = escape_tags(trim($_POST['location']));
$type = 'event'; $type = 'event';
if((! $desc) || (! $start)) { if((! $summary) || (! $start)) {
notice( t('Event description and start time are required.') . EOL); notice( t('Event title and start time are required.') . EOL);
goaway($a->get_baseurl() . '/events/new'); goaway($a->get_baseurl() . '/events/new');
} }
@ -412,9 +412,9 @@ function events_content(&$a) {
'$uri' => $uri, '$uri' => $uri,
'$title' => t('Event details'), '$title' => t('Event details'),
'$desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat), '$desc' => sprintf( t('Format is %s %s. Starting date and Title are required.'),$dateformat,$timeformat),
'$s_text' => t('Event Starts:') . ' <span class="required">*</span> ', '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
'$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday), '$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday),
'$s_tsel' => timesel('start',$shour,$sminute), '$s_tsel' => timesel('start',$shour,$sminute),
'$n_text' => t('Finish date/time is not known or not relevant'), '$n_text' => t('Finish date/time is not known or not relevant'),
@ -424,11 +424,11 @@ function events_content(&$a) {
'$f_tsel' => timesel('finish',$fhour,$fminute), '$f_tsel' => timesel('finish',$fhour,$fminute),
'$a_text' => t('Adjust for viewer timezone'), '$a_text' => t('Adjust for viewer timezone'),
'$a_checked' => $a_checked, '$a_checked' => $a_checked,
'$d_text' => t('Description:') . ' <span class="required">*</span>', '$d_text' => t('Description:'),
'$d_orig' => $d_orig, '$d_orig' => $d_orig,
'$l_text' => t('Location:'), '$l_text' => t('Location:'),
'$l_orig' => $l_orig, '$l_orig' => $l_orig,
'$t_text' => t('Title:'), '$t_text' => t('Title:') . ' <span class="required" title="' . t('Required') . '">*</span>',
'$t_orig' => $t_orig, '$t_orig' => $t_orig,
'$sh_text' => t('Share this event'), '$sh_text' => t('Share this event'),
'$sh_checked' => $sh_checked, '$sh_checked' => $sh_checked,

24
view/theme/duepuntozero/style.css
View File

@ -2421,6 +2421,30 @@ aside input[type='text'] {
font-size: 20px; 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-summary {
width: 400px;
}
.vevent { .vevent {
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
} }