Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

calendar slot fix #896

Merged
merged 1 commit into from Jul 1, 2017
Merged

calendar slot fix #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions interface/main/calendar/modules/PostCalendar/pntemplates/default/views/header.html
View file
Open in desktop
Expand Up @@ -5,13 +5,13 @@
<link rel="stylesheet" href="[-php-]echo $GLOBALS['assets_static_relative'][-/php-]/font-awesome-4-6-3/css/font-awesome.min.css">

<!-- this style sheet is used for the ajax_* style calendars -->
<link rel="stylesheet" href="[-php-]echo $GLOBALS['webroot'].'/interface/themes/ajax_calendar.css';[-/php-]" type="text/css">
<link rel="stylesheet" href="[-php-]echo $GLOBALS['webroot'].'/interface/themes/ajax_calendar.css?v='.$GLOBALS['v_js_includes'];[-/php-]" type="text/css">
<!--[if IE]>
<link rel="stylesheet" href="[-php-]echo $GLOBALS['webroot'].'/interface/themes/ajax_calendar_ie.css';[-/php-]" type="text/css"/>
<![endif]-->

<!-- the javascript used for the ajax_* style calendars -->
<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/dialog.js?v=[-php-] echo $v_js_includes; [-/php-]"></script>
<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/dialog.js?v=[-php-] echo $GLOBALS['v_js_includes']; [-/php-]"></script>
<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/textformat.js"></script>
<script type="text/javascript" src="[-php-] echo $GLOBALS['assets_static_relative'] [-/php-]/jquery-min-1-7-2/index.js"></script>
<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/js/calendarDirectSelect.js"></script>
Expand Down
5 changes: 2 additions & 3 deletions interface/themes/ajax_calendar.css
View file
Open in desktop
@@ -1,5 +1,5 @@
/* ====================================
* the style sheet for the ajax_template calendar
* the style sheet for the ajax_template calendar
* ====================================*/

a {
Expand Down Expand Up @@ -185,10 +185,9 @@ div.tiny { width:1px; height:1px; font-size:1px; }
/* the DIV of times */
#times {
border-right: 1px solid #999;
width: 2em;
width: 1%;
background-color: #FFF3D1;
padding: 0px;
max-width: 12px;
}
#times table {
border-collapse: collapse;
Expand Down
2 changes: 1 addition & 1 deletion version.php
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
$v_js_includes = md5(microtime());
} else {
// Change this number when bumping
$v_js_includes = 38;
$v_js_includes = 39;
}
// Do note modify below
$GLOBALS['v_js_includes'] = $v_js_includes;