Permalink
Browse files

Merge branch 'master' of github.com:ufrgs-hyman/meican

Conflicts:
	apps/circuits/views/reservations_view2.php
	webroot/css/jquery.weekcalendar.css
	webroot/css/style1.css
  • Loading branch information...
2 parents aa77c4d + 9c7a63c commit 036256398f52aa4bf240536cfcd3101993cf3a39 @labianchin labianchin committed Mar 23, 2012
Showing with 6 additions and 6 deletions.
  1. +6 −6 apps/circuits/views/reservations_view2.php
@@ -51,7 +51,8 @@
<link rel="stylesheet" type="text/css" href="<?php echo $this->url(); ?>webroot/css/jquery.weekcalendar.css" />
<script type="text/javascript" src="<?php echo $this->url(); ?>webroot/js/jquery.weekcalendar.js"></script>
- <link rel='stylesheet' type='text/css' href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/start/jquery-ui.css' />
+ <?php /*
+ <link rel='stylesheet' type='text/css' href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/start/jquery-ui.css' />*/?>
<script type="text/javascript">
$(function() {
var $calendar = $('#calendar');
@@ -66,7 +67,6 @@
businessHours :{start: 8, end: 18, limitDisplay: true },
daysToShow : 7,
height : function($calendar) {
- console.debug($(window).height() - $("h1").outerHeight() - 1);
return $(window).height() - $("h1").outerHeight() - 1;
},
eventRender : function(calEvent, $event) {
@@ -85,12 +85,12 @@
$event.addClass('authorization-waiting');
}
},
- draggable : function(calEvent, $event) {
+ /* draggable : function(calEvent, $event) {
return calEvent.readOnly != true;
},
resizable : function(calEvent, $event) {
return calEvent.readOnly != true;
- },/*
+ },
eventNew : function(calEvent, $event) {
var $dialogContent = $("#event_edit_container");
resetForm($dialogContent);
@@ -134,7 +134,7 @@
eventDrop : function(calEvent, $event) {
},
eventResize : function(calEvent, $event) {
- },
+ },*/
eventClick : function(calEvent, $event) {
if (calEvent.readOnly) {
@@ -184,7 +184,7 @@
setupStartAndEndTimeFields(startField, endField, calEvent, $calendar.weekCalendar("getTimeslotTimes", calEvent.start));
$(window).resize().resize(); //fixes a bug in modal overlay size ??
- },*/
+ },
eventMouseover : function(calEvent, $event) {
},
eventMouseout : function(calEvent, $event) {

0 comments on commit 0362563

Please sign in to comment.