From dc6adf1f079b72c505ef67a9237e3a897c40fd2f Mon Sep 17 00:00:00 2001
From: Tihomir Valkanov <tihomir.valkanov@gmail.com>
Date: Fri, 8 Nov 2013 06:28:23 -0600
Subject: [PATCH 1/2] swipe gesture to go back on the feed

---
 Eventer/scripts/app/main.js  |  5 +++++
 Eventer/styles/main.css      |  6 ++++--
 Eventer/views/eventView.html | 12 ++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Eventer/scripts/app/main.js b/Eventer/scripts/app/main.js
index 95baf0e..d90ab8e 100644
--- a/Eventer/scripts/app/main.js
+++ b/Eventer/scripts/app/main.js
@@ -358,6 +358,11 @@ var app = (function () {
                 user ? btn.text("Cancel") : btn.text("Join!");
                 
                 btn.kendoTouch({ tap: function (e) { joinCancel() } });
+                $("body").kendoTouch({ enableSwipe: true, swipe: function (e) {
+                    if(e.direction === "right") {
+                        mobileApp.navigate('#:back');
+                    }
+                } });
             }
         };
     }());
diff --git a/Eventer/styles/main.css b/Eventer/styles/main.css
index f5eef3c..fbfd2b5 100644
--- a/Eventer/styles/main.css
+++ b/Eventer/styles/main.css
@@ -512,7 +512,8 @@ textarea
 
 .event-white-box.part{
     text-align: left;
-    float: left;
+    line-height: 50px;
+    height: 50px;
 }
 
 .event-title {
@@ -544,6 +545,7 @@ textarea
     width: 45px;
     height: 45px;
     border-radius: 10px;
+    margin: 4px;
+    margin-bottom: 5px;
     float: left;
-    margin: 5px;
 }
\ No newline at end of file
diff --git a/Eventer/views/eventView.html b/Eventer/views/eventView.html
index 786c218..753a79c 100644
--- a/Eventer/views/eventView.html
+++ b/Eventer/views/eventView.html
@@ -1,4 +1,4 @@
-<div data-role="view" id="single-activity" data-layout="default" class="activities-view" data-show="app.viewModels.event.show">
+<div data-role="view" id="single-event" data-layout="default" class="activities-view" data-show="app.viewModels.event.show">
     <script>
     </script>
     <header data-role="header">
@@ -22,11 +22,11 @@
             <button id="joinBtn" class="event-join-btn">Join!</button>
         </div>
         <div class="event-white-box part">
-            <span class="part-count" data-bind="text: ParticipantsCount()"></span>
-            <span class="max-part-count">/</span>
-            <span class="max-part-count" data-bind="text: MaxParticipants"></span>
-        </div>
-        <div style="background: white; float: left; width: 210px">
+            <div style="float: left;">
+                <span class="part-count" data-bind="text: ParticipantsCount()"></span>
+                <span class="max-part-count">/</span>
+                <span class="max-part-count" data-bind="text: MaxParticipants"></span>
+            </div>
             <img src="http://api.everlive.com/v1/x0JGkn5LGo9RHsjo/Files/835b7d40-480e-11e3-81ba-e551d52aa73d/Download" class="part-pic" />
             <img src="http://api.everlive.com/v1/x0JGkn5LGo9RHsjo/Files/8fe66570-480e-11e3-9f50-d779695f113f/Download" class="part-pic" />
         </div>

From fd5712734a1cee62a2f996fae86cf35b906aadcd Mon Sep 17 00:00:00 2001
From: Tihomir Valkanov <tihomir.valkanov@gmail.com>
Date: Fri, 8 Nov 2013 06:32:21 -0600
Subject: [PATCH 2/2] get rid of the logout and back buttons

---
 Eventer/scripts/app/main.js  | 6 +++++-
 Eventer/views/eventView.html | 1 -
 Eventer/views/feedView.html  | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Eventer/scripts/app/main.js b/Eventer/scripts/app/main.js
index d90ab8e..ab13c80 100644
--- a/Eventer/scripts/app/main.js
+++ b/Eventer/scripts/app/main.js
@@ -315,9 +315,12 @@ var app = (function () {
         var eventSelected = function (e) {
             mobileApp.navigate('views/eventView.html?uid=' + e.data.uid);
         };
+        
+        /*
         var navigateHome = function () {
             mobileApp.navigate('#welcome');
         };
+        
         var logout = function () {
             AppHelper.logout()
             .then(navigateHome, function (err) {
@@ -325,10 +328,11 @@ var app = (function () {
                 navigateHome();
             });
         };
+        */
         return {
             feed: EventsModel.events,
             eventSelected: eventSelected,
-            logout: logout
+            //logout: logout
         };
     }());
 
diff --git a/Eventer/views/eventView.html b/Eventer/views/eventView.html
index 753a79c..00d2019 100644
--- a/Eventer/views/eventView.html
+++ b/Eventer/views/eventView.html
@@ -4,7 +4,6 @@
     <header data-role="header">
         <div data-role="navbar">
             Event
-            <a class="nav-button" data-align="left" data-role="backbutton">Back</a>
         </div>
     </header>
 
diff --git a/Eventer/views/feedView.html b/Eventer/views/feedView.html
index c2281c7..678c315 100644
--- a/Eventer/views/feedView.html
+++ b/Eventer/views/feedView.html
@@ -2,7 +2,6 @@
     <header data-role="header">
         <div data-role="navbar">
             Feed
-            <a class="nav-button" data-align="left" data-role="backbutton" data-click="app.viewModels.feed.logout">Log out</a>
             <a class="nav-button" data-align="right" data-role="button" data-icon="add" href="views/addActivityView.html"></a>
         </div>
     </header>