main updated, new sections added to the app, layout of events updated

www/templates/event.html

@@ -3,7 +3,7 @@
     <a class="item item-avatar" ng-href="#/app/users/{{event.user._id}}">
       <img ng-src="{{event.user.img}}">
       <h2>{{event.user.username}}</h2>
-      <p>{{event.user.description}}</p>
+      <p>{{event.user.shortDescription}}</p>
     </a>
     <div class="item item-image">
       <img ng-src="{{event.img}}">

www/templates/events.html

@@ -1,17 +1,35 @@
 <ion-view view-title="Events">
   <ion-content>
-      <ion-refresher
-        pulling-text="{{'Pull_to_refresh' | translate}}..."
-        on-refresh="doRefresh()">
-      </ion-refresher>
+    <ion-refresher pulling-text="{{'Pull_to_refresh' | translate}}..." on-refresh="doRefresh()">
+    </ion-refresher>
 
-    <a class="item item-thumbnail-left" href="#/app/events/{{event._id}}"
+    <!--<a class="item item-thumbnail-left" href="#/app/events/{{event._id}}"
     ng-repeat="event in events">
       <img ng-src="{{event.img}}">
       <div class="badge item-note">{{event.user.username}}</div>
       <h2>{{event.title}}</h2>
       <p>{{event.description}}</p>
       <p>{{event.date | date: 'HH:mm, dd/MM/yyyy'}}</p>
-    </a>
+  </a>-->
+    <div ng-repeat="event in events">
+
+      <a class="item item-avatar" ng-href="#/app/users/{{event.user._id}}">
+        <img ng-src="{{event.user.img}}">
+        <h2>{{event.user.username}}</h2>
+        <p>{{event.user.shortDescription}}</p>
+      </a>
+      <a ng-href="#/app/events/{{event._id}}" class="item item-image">
+
+        <img ng-src="{{event.img}}">
+        <h2>{{event.title}}</h2>
+        <p>{{event.description}}</p>
+        <p>{{event.date | date: 'HH:mm, dd/MM/yyyy'}}</p>
+
+        <a class="item item-icon-left ct_indigo500" ng-click="share()">
+          <i class="icon ion-android-share-alt"></i> Share
+        </a>
+        <div class="item"></div>
+      </a>
+    </div>
   </ion-content>
 </ion-view>

www/templates/main.html

@@ -2,28 +2,35 @@
   <ion-content>
     <div class="row o_mainOptionRow">
       <a class="col c_pink400" ng-href="#/app/events">
-        <i class="icon ion-calendar"></i>
+        <i class="icon ion-clipboard"></i><!--events-->
       </a>
       <a class="col c_indigo400" ng-href="#/app/users">
         <i class="icon ion-person-stalker"></i>
       </a>
     </div>
     <div class="row o_mainOptionRow">
-        <a class="col c_green400" ng-href="#/app/search">
-          <i class="icon ion-ios-location"></i>
-        </a>
-
-      <a class="col c_orange400" ng-href="#/app/settings">
-        <i class="icon ion-ios-color-filter"></i>
+      <a class="col c_green400" ng-href="#/app/byplace">
+        <i class="icon ion-ios-location"></i><!--by place-->
       </a>
+          <a class="col c_orange400" ng-href="#/app/bydate">
+            <i class="icon ion-calendar"></i><!--by date-->
+          </a>
     </div>
     <div class="row o_mainOptionRow">
         <a class="col c_yellow600" ng-href="#/app/search">
           <i class="icon ion-search"></i>
         </a>
+        <a class="col c_cyan400" ng-href="#/app/bycategories">
+          <i class="icon ion-pound"></i><!--by categories-->
+        </a>
+    </div>
+    <div class="row o_mainOptionRow">
       <a class="col c_deepPurple400" ng-href="#/app/settings">
         <i class="icon ion-ios-gear"></i>
       </a>
+      <a class="col c_blueGrey300" ng-href="#/app/settings">
+        <i class="icon ion-code"></i>
+      </a>
     </div>
   </ion-content>
 </ion-view>

www/templates/menu.html

@@ -22,11 +22,20 @@
           <i class="icon ion-home"></i> {{'Main' | translate }}
         </a>
         <a class="item item-icon-left" menu-close href="#/app/events">
-          <i class="icon ion-calendar"></i> Events
+          <i class="icon ion-clipboard"></i> Events
         </a>
         <a class="item item-icon-left" menu-close href="#/app/users">
           <i class="icon ion-person-stalker"></i> Users
         </a>
+        <a class="item item-icon-left" menu-close href="#/app/events">
+          <i class="icon ion-pound"></i> By Categories
+        </a>
+        <a class="item item-icon-left" menu-close href="#/app/events">
+          <i class="icon ion-ios-location"></i> By Place
+        </a>
+        <a class="item item-icon-left" menu-close href="#/app/events">
+          <i class="icon ion-calendar"></i> By Date
+        </a>
         <a class="item item-icon-left" menu-close href="#/app/search">
           <i class="icon ion-search"></i> Search
         </a>

www/templates/user.html

@@ -8,10 +8,10 @@
             </span>
         </div>
         <h2>{{user.username}}</h2>
-        <p>{{user.email}}</p>
+        <p>{{user.shortDescription}}</p>
       </div>
       <div class="item item-body">
-        asdf asdflk jasdfljashd fljkas dflka shdfklasd {{user.description}}
+        {{user.description}}
       </div>
 
           <leaflet width="100%" height="40%" markers="markers" center="center"

www/templates/users.html

@@ -9,7 +9,7 @@
       ng-repeat="user in users" type="item-text-wrap" href="#/app/users/{{user._id}}">
         <img ng-src="{{user.img}}">
         <h2>{{user.username}}</h2>
-        <p>{{user.email}}</p>
+        <p>{{user.shortDescription}}</p>
 
         <span class="badge badge-balanced">Following</span>
       </ion-item>