Skip to content

Commit

Permalink
Merge pull request #36 from ebarquero85/patch-1
Browse files Browse the repository at this point in the history
Files js & css
  • Loading branch information
Edofre authored Oct 25, 2017
2 parents a44e9b6 + eb3eb19 commit c964fd0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions src/views/files.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!-- fullcalendar css -->
<link href="/css/fullcalendar.print.css" rel="stylesheet" media="print">
<link href="/css/fullcalendar.css" rel="stylesheet">
<link href="{{ asset('css/fullcalendar.print.css') }}" rel="stylesheet" media="print">
<link href="{{ asset('css/fullcalendar.css') }}" rel="stylesheet">
<!-- moment js -->
<script src="/js/moment.js"></script>
<script src="{{ asset('js/moment.js') }}"></script>
<!-- fullcalendar js -->
<script src="/js/fullcalendar.js"></script>
<script src="/js/locale-all.js"></script>
<script src="{{ asset('js/fullcalendar.js') }}"></script>
<script src="{{ asset('js/locale-all.js') }}"></script>

@if($include_gcal)
<script src="/js/gcal.js"></script>
@endif
<script src="{{ asset('js/gcal.js') }}"></script>
@endif
12 changes: 6 additions & 6 deletions tests/Integration/FullcalendarTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ public function generate_event_with_id()

// This looks terrible, I'm sorry...
$this->assertEquals("<div id='fullcalendar'></div><!-- fullcalendar css -->
<link href=\"/css/fullcalendar.print.css\" rel=\"stylesheet\" media=\"print\">
<link href=\"/css/fullcalendar.css\" rel=\"stylesheet\">
<link href=\"http://localhost/css/fullcalendar.print.css\" rel=\"stylesheet\" media=\"print\">
<link href=\"http://localhost/css/fullcalendar.css\" rel=\"stylesheet\">
<!-- moment js -->
<script src=\"/js/moment.js\"></script>
<script src=\"http://localhost/js/moment.js\"></script>
<!-- fullcalendar js -->
<script src=\"/js/fullcalendar.js\"></script>
<script src=\"/js/locale-all.js\"></script>
<script src=\"http://localhost/js/fullcalendar.js\"></script>
<script src=\"http://localhost/js/locale-all.js\"></script>
<script type=\"text/javascript\">
Expand All @@ -41,4 +41,4 @@ public function generate_event_with_id()
</script>
", $calendar->generate());
}
}
}

0 comments on commit c964fd0

Please sign in to comment.