[ExercisePlanner] updated ExercisePlanner sources

Change-Id: Id27f70ee0a6affca68a40880a4026a77368861af

diff --git a/css/style.css b/css/style.css
index a2ffa15..fb5c029 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -369,3 +369,7 @@ ul.times .ui-btn-picker {
        text-overflow: ellipsis;
        overflow: hidden;
 }
+
+#add_custom_workout_btn, #selectExercisesBar, #btnNewExercise {
+       color: #555;
+}

diff --git a/index.html b/index.html
index 7973490..863098a 100644 (file)
--- a/index.html
+++ b/index.html
@@ -132,10 +132,8 @@
                </div>
 
                <div data-role="footer" data-position="fixed">
-                       <div id="selectExercisesBar" data-role="tabbar" data-style="toolbar">
-                               <ul>
-                                       <li><a href="#selectExercises">Select Workouts</a></li>
-                               </ul>
+                       <div data-role="button" id="selectExercisesBar">
+                               Select Workouts
                        </div>
                </div>
        </div>
@@ -153,10 +151,8 @@
                </div>
 
                <div data-role="footer" data-position="fixed">
-                       <div data-role="tabbar" data-style="tabbar">
-                               <ul>
-                                       <li><a href="#customExercises" id="add_custom_workout_btn">Add Custom Workout</a></li>
-                               </ul>
+                       <div data-role="button" id="add_custom_workout_btn">
+                               Add Custom Workout
                        </div>
                </div>
 
@@ -176,13 +172,10 @@
                </div>
 
                <div data-role="footer" data-position="fixed">
-                       <div data-role="tabbar" data-style="tabbar">
-                               <ul>
-                                       <li><a href="#" id="btnNewExercise">Add</a></li>
-                               </ul>
+                       <div data-role="button" id="btnNewExercise">
+                               Add
                        </div>
                </div>
-
        </div>
 
        <div data-role="page" id="rangesOfTimes">

diff --git a/js/UI.js b/js/UI.js
index e4a2afa..e67f44f 100644 (file)
--- a/js/UI.js
+++ b/js/UI.js
@@ -306,7 +306,6 @@ function UI() {
 
        UI.prototype.showWaitOk = function () {
                $('#mainControl').hide();
-               $('#one .ui-btn-back').hide();
 
                $('#onAlertControl').tabbar();
                $('#onAlertControl').show();
@@ -350,6 +349,18 @@ function UI() {
                        $('#startStop').blur();
                });
 
+               $('#options').on('click', function () {
+                       $.mobile.changePage('#two');
+               });
+
+               $('#selectExercisesBar').on('click', function () {
+                       $.mobile.changePage('#selectExercises');
+               });
+
+               $('#add_custom_workout_btn').on('click', function () {
+                       $.mobile.changePage('#customExercises');
+               });
+
                window.addEventListener('tizenhwkey', function(e) {
                        if (e.keyName == 'back') {
                                if ($.mobile.popup.active) {