Skip to content

Commit

Permalink
adds icon to make appointments semi-transparent. also fixes css strea…
Browse files Browse the repository at this point in the history
…ming in gulpfile (openemr#1874)
  • Loading branch information
Daniel Sandoval authored and bradymiller committed Sep 22, 2018
1 parent 8298d25 commit 5b9bb8b
Show file tree
Hide file tree
Showing 5 changed files with 837 additions and 4 deletions.
5 changes: 5 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var rename = require('gulp-rename');
var runSequence = require('run-sequence');
var sass = require('gulp-sass');
var sourcemaps = require('gulp-sourcemaps');
var watch = require('gulp-watch');


var packages = require('./package.json');
Expand Down Expand Up @@ -223,6 +224,10 @@ gulp.task('install', function() {
gulp.task('watch', function() {
// watch all changes and re-run styles
gulp.watch('./interface/**/*.scss', {interval: 1000, mode: 'poll'}, ['styles']);

// watch all changes to css/php files in themes and copy to public
return watch('./interface/themes/*.{css,php}', { ignoreInitial: false })
.pipe(gulp.dest(config.dest.themes));
});

gulp.task('sync-only', function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,8 @@
}
}
if ($catid == 1) $content .= "</strike>";

$content .= "</a>";
$content .= '<a class="show-appointment shown"></a>';
}
elseif($groupid){
$divTitle .= "\n" . getTypeName($grouptype) . "\n";
Expand Down Expand Up @@ -916,6 +916,16 @@
$(".event").mouseover(function() { $(this).toggleClass("event_highlight"); });
$(".event").mouseout(function() { $(this).toggleClass("event_highlight"); });

$(".show-appointment").on('click', function() {
var self = $( this );
if (self.hasClass('shown')) {
self.parent().parent('.event_appointment').css('opacity' , '0.1').css('pointer-events' , 'none');
self.removeClass('shown').addClass('unshown').css('pointer-events' , 'all');
} else {
self.parent().parent('.event_appointment').css('opacity' , '1').css('pointer-events' , 'unset');
self.removeClass('unshown').addClass('shown').css('pointer-events' , 'unset');
}
})

$(".tdMonthName-small").click(function() {

Expand Down
17 changes: 17 additions & 0 deletions interface/themes/ajax_calendar.css
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,23 @@ div.tiny { width:1px; height:1px; font-size:1px; }
color: red;
}

.show-appointment {
position: absolute;
bottom: 2px;
right: 4px;
font-family: 'FontAwesome';
}

.show-appointment.unshown::before {
cursor: pointer;
content: "\f06e";
}

.show-appointment.shown::before {
cursor: pointer;
content: "\f070";
}

.view1 {
font-size:10px;
}
Expand Down
Loading

0 comments on commit 5b9bb8b

Please sign in to comment.