event cal 1.75

This commit is contained in:
Ian 2016-01-10 17:15:25 +01:00
parent 60e3d3ba4d
commit 21128cc9b6
4 changed files with 35 additions and 21 deletions

View file

@ -3,6 +3,13 @@
* *
v.1.75:
-------
* Add selector for the eventwrapper sidebar month name title
* Some more finetuned overwriting margins for the frontend
v.1.74: v.1.74:
------- -------

View file

@ -106,6 +106,13 @@ ChangeLOG:
* Legend: ! Bugfix, + New Features, * Changed, - Info Only * Legend: ! Bugfix, + New Features, * Changed, - Info Only
* *
* *
* v.1.75 2016-01-10
* ===========================
*
* Add selector for the eventwrapper sidebar month name title
* Some more finetuned overwriting margins for the frontend
*
*
* v.1.74 2015-12-19 * v.1.74 2015-12-19
* =========================== * ===========================
* *

View file

@ -76,7 +76,7 @@ class serendipity_event_cal extends serendipity_event {
) )
); );
$propbag->add('author', 'Ian (Timbalu)'); $propbag->add('author', 'Ian (Timbalu)');
$propbag->add('version', '1.74'); $propbag->add('version', '1.75');
$propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES')); $propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES'));
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.4', 'serendipity' => '1.4',
@ -180,7 +180,7 @@ class serendipity_event_cal extends serendipity_event {
break; break;
default: default:
return false; break;
} }
return true; return true;
} }
@ -2174,7 +2174,7 @@ class serendipity_event_cal extends serendipity_event {
-1 => CAL_EVENT_FORM_DAY_LAST, -1 => CAL_EVENT_FORM_DAY_LAST,
-2 => CAL_EVENT_FORM_DAY_SECONDLAST, -2 => CAL_EVENT_FORM_DAY_SECONDLAST,
-3 => CAL_EVENT_FORM_DAY_THIRDLAST -3 => CAL_EVENT_FORM_DAY_THIRDLAST
); );
} }
if (isset($_REQUEST['calendar']['cm'])) $cm = (int)$_REQUEST['calendar']['cm']; if (isset($_REQUEST['calendar']['cm'])) $cm = (int)$_REQUEST['calendar']['cm'];
if (isset($_REQUEST['calendar']['cy'])) $cy = (int)$_REQUEST['calendar']['cy']; if (isset($_REQUEST['calendar']['cy'])) $cy = (int)$_REQUEST['calendar']['cy'];
@ -2429,7 +2429,7 @@ class serendipity_event_cal extends serendipity_event {
// some content output for the eventwrapper faking sidebar plugin // some content output for the eventwrapper faking sidebar plugin
echo ' echo '
<div class="eventcal_monthly_events"> <div class="eventcal_monthly_events">
<h4>Events '.$monthName.' '.$y.'</h4> <div class="eventcal_sidebar_month_title">Events '.$monthName.' '.$y.'</div>
<ul class="plainList"> <ul class="plainList">
'; ';
@ -2558,7 +2558,6 @@ class serendipity_event_cal extends serendipity_event {
break; break;
default: default:
return false;
break; break;
} }
exit; exit;
@ -2576,7 +2575,6 @@ class serendipity_event_cal extends serendipity_event {
if (empty($serendipity['GET']['subpage'])) { if (empty($serendipity['GET']['subpage'])) {
$serendipity['GET']['subpage'] = $nice_url; $serendipity['GET']['subpage'] = $nice_url;
} }
break; break;
case 'entry_display': case 'entry_display':
@ -2598,7 +2596,6 @@ class serendipity_event_cal extends serendipity_event {
if (version_compare($serendipity['version'], '1.4', '<=')) { if (version_compare($serendipity['version'], '1.4', '<=')) {
$this->show(); $this->show();
} }
break; break;
case 'entries_header': case 'entries_header':
@ -2623,8 +2620,9 @@ class serendipity_event_cal extends serendipity_event {
$tfile = dirname(__FILE__) . '/style_eventcal.css'; $tfile = dirname(__FILE__) . '/style_eventcal.css';
$frontend_css = str_replace('{TEMPLATE_PATH}', $serendipity['eventcal']['pluginpath'], @file_get_contents($tfile)); $frontend_css = str_replace('{TEMPLATE_PATH}', $serendipity['eventcal']['pluginpath'], @file_get_contents($tfile));
} }
if (!empty($frontend_css)) $this->backend_eventcal_css($eventData, $frontend_css); // append to stream if (!empty($frontend_css)) {
$this->backend_eventcal_css($eventData, $frontend_css); // append to stream
}
break; break;
case 'backend_sidebar_entries': case 'backend_sidebar_entries':
@ -2689,12 +2687,12 @@ class serendipity_event_cal extends serendipity_event {
$tfilecontent = $tfilecontent . $css2; $tfilecontent = $tfilecontent . $css2;
// add replaced css content to the end of serendipity_admin.css // add replaced css content to the end of serendipity_admin.css
if (!empty($tfilecontent)) $this->backend_eventcal_css($eventData, $tfilecontent); if (!empty($tfilecontent)) {
$this->backend_eventcal_css($eventData, $tfilecontent);
}
break; break;
default: default:
return false;
break; break;
} // switch end } // switch end
@ -2798,7 +2796,6 @@ class serendipity_event_cal extends serendipity_event {
/* add event form */ /* add event form */
$this->backend_eventcal_add($reqbuild); $this->backend_eventcal_add($reqbuild);
} }
break; break;
case 'adevilog': case 'adevilog':
@ -3248,8 +3245,9 @@ class serendipity_event_cal extends serendipity_event {
} else { } else {
echo $this->backend_eventcal_smsg() . PLUGIN_EVENTCAL_ADMIN_DBC_DUMP_MSG . $this->backend_eventcal_emsg(); echo $this->backend_eventcal_smsg() . PLUGIN_EVENTCAL_ADMIN_DBC_DUMP_MSG . $this->backend_eventcal_emsg();
} }
} else echo '<div class="backend_eventcal_noresult backend_eventcal_dbclean_error"><p class="msg_error">' . $attention . 'Not allowed - wrong DB type!</p></div>'; } else {
echo '<div class="backend_eventcal_noresult backend_eventcal_dbclean_error"><p class="msg_error">' . $attention . 'Not allowed - wrong DB type!</p></div>';
}
break; break;
case 'dbdownload': case 'dbdownload':
@ -3408,7 +3406,6 @@ class serendipity_event_cal extends serendipity_event {
break; break;
default: default:
return false;
break; break;
} }
@ -3740,5 +3737,6 @@ class serendipity_event_cal extends serendipity_event {
} // function free table end } // function free table end
} // class end } // class end
/* vim: set sts=4 ts=4 expandtab : */ /* vim: set sts=4 ts=4 expandtab : */

View file

@ -1,6 +1,6 @@
/************************************************************************************/ /************************************************************************************/
/* style_eventcal.css for serendipity_eventcal_cal.php v.1.72 2015-12-07 Ian */ /* style_eventcal.css for serendipity_eventcal_cal.php v.1.75 2016-01-10 Ian */
/************************************************************************************/ /************************************************************************************/
/*****************************************/ /*****************************************/
@ -30,14 +30,15 @@
} }
} }
.serendipity_Entry_Date h3 { .serendipity_Entry_Date h3 {
margin: 0px 0.6em 0.6em; margin: 0px 0.8em 0.6em;
} }
.serendipity_Entry_Date h4 { .serendipity_Entry_Date h4 {
margin: 0px 0.8em 0.8em; margin: 0px 1em 0.8em;
} }
.serendipity_entry { .serendipity_entry, .freetag_cloud {
margin: 0px 0.8em 3em; margin: 0px 0px 3em 1em;
} }
table { table {
border-collapse: separate; border-collapse: separate;
border-spacing: 1px; border-spacing: 1px;
@ -763,3 +764,4 @@ a.small_eventcal_link:focus {
#eventcal_wrapper input.bbc_u { margin: 2px 2px 0; padding: 2px; text-decoration: underline; font-size: 12px; } #eventcal_wrapper input.bbc_u { margin: 2px 2px 0; padding: 2px; text-decoration: underline; font-size: 12px; }
#eventcal_wrapper input.bbc_s { margin: 2px 2px 0; padding: 2px; font-style: italic; font-size: 12px; } #eventcal_wrapper input.bbc_s { margin: 2px 2px 0; padding: 2px; font-style: italic; font-size: 12px; }
.eventcal_sidebar_month_title { margin: 0px; padding: 0; font-weight: 600; font-size: 1.17em; }