@@ -7,6 +7,7 @@ },
   "dependencies": {
     "angular-translate": "^2.14.0",
     "ui-leaflet": "^2.0.0",
-    "ngCordova": "^0.1.27-alpha"
+    "ngCordova": "^0.1.27-alpha",
+    "ionic-calendar": "^0.3.7"
   }
 }

@@ -42,6 +42,10 @@ <!-- Angular Translate -->
     <script src="lib/angular-translate/angular-translate.js"></script>
     <script src="js/translations.js"></script>
 
+    <!-- ionic-calendar -->
+    <link rel="stylesheet" href="lib/ionic-calendar/dist/css/calendar.min.css"/>
+    <script src="lib/ionic-calendar/dist/js/calendar-tpls.min.js"></script>
+
     <!-- your app's js -->
     <script src="js/app.js"></script>
     <script src="js/menu.js"></script>
@@ -55,6 +59,7 @@ <script src="js/categories.js"></script>
     <script src="js/byCategory.js"></script>
     <script src="js/place.js"></script>
     <script src="js/byPlace.js"></script>
+    <script src="js/calendar.js"></script>
     <script src="js/users.js"></script>
     <script src="js/user.js"></script>
     <script src="js/login.js"></script>

@@ -18,6 +18,7 @@ 'app.categories',
     'app.byCategory',
     'app.place',
     'app.byPlace',
+    'app.calendar',
     'app.users',
     'app.user',
     'app.login',
@@ -139,6 +140,15 @@ views: {
         'menuContent': {
           templateUrl: 'templates/byPlace.html',
           controller: 'ByPlaceCtrl'
+        }
+      }
+    })
+    .state('app.calendar', {
+      url: '/calendar',
+      views: {
+        'menuContent': {
+          templateUrl: 'templates/calendar.html',
+          controller: 'CalendarCtrl'
         }
       }
     })

@@ -0,0 +1,5 @@
+angular.module('app.calendar', ['pascalprecht.translate', 'ui.rCalendar'])
+
+.controller('CalendarCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) {
+
+});

@@ -0,0 +1,6 @@
+<ion-view view-title="Calendar">
+  <ion-content>
+    <calendar calendar-mode="mode"
+    event-source="eventSource">
+  </ion-content>
+</ion-view>

@@ -25,7 +25,7 @@ <i class="icon ion-pound"></i><!--by categories-->
         </a>
     </div>
     <div class="row o_mainOptionRow">
-        <a class="col c_indigo300" ng-href="#/app/bydate">
+        <a class="col c_indigo300" ng-href="#/app/calendar">
           <i class="icon ion-calendar"></i><!--by date-->
         </a>
       <a class="col c_orange400" ng-href="#/app/settings">

@@ -39,7 +39,7 @@ </a>
         <!--<a class="item item-icon-left" menu-close href="#/app/place">
           <i class="icon ion-ios-location"></i> By Place
       </a>-->
-        <a class="item item-icon-left" menu-close href="#/app/events">
+        <a class="item item-icon-left" menu-close href="#/app/calendar">
           <i class="icon ion-calendar"></i> By Date
         </a>
         <a class="item item-icon-left" menu-close href="#/app/search">