diff options
| author | Piotr Dabrowski <p.dabrowski2@samsung.com> | 2013-07-13 13:40:50 +0200 |
|---|---|---|
| committer | Piotr Dabrowski <p.dabrowski2@samsung.com> | 2013-07-13 13:40:50 +0200 |
| commit | f8e11bc7ef3e64f51d16a257e2f65ed0b444beb7 (patch) | |
| tree | 9ffbcc1bbcb2138375ac9de1f7745b46db739da1 | |
| parent | f4cfd407be3512ece64e11d29b595349e912991c (diff) | |
| download | EventManager-f8e11bc7ef3e64f51d16a257e2f65ed0b444beb7.tar.gz EventManager-f8e11bc7ef3e64f51d16a257e2f65ed0b444beb7.tar.bz2 EventManager-f8e11bc7ef3e64f51d16a257e2f65ed0b444beb7.zip | |
[EventManager] updated EventManager sources
Change-Id: I6d0850f57e8ecba85e2b96bb6b266d999f48204b
| -rw-r--r-- | js/app.ui.js | 2 | ||||
| -rw-r--r-- | templates/alarm.tpl | 8 | ||||
| -rw-r--r-- | templates/new_event.tpl | 15 |
3 files changed, 16 insertions, 9 deletions
diff --git a/js/app.ui.js b/js/app.ui.js index c9bcdea..30ba86b 100644 --- a/js/app.ui.js +++ b/js/app.ui.js @@ -121,6 +121,8 @@ function Ui() { if ($.mobile.activePage.attr('id') === 'home') { tizen.application.getCurrentApplication().exit(); } else if ($.mobile.activePage.attr('id') === 'new_event') { + $("#demo-date-1").datetimepicker("value", new Date); + $("#demo-date-2").datetimepicker("value", new Date); $.mobile.changePage("#home"); } else { history.back(); diff --git a/templates/alarm.tpl b/templates/alarm.tpl index 2697b48..975ea9f 100644 --- a/templates/alarm.tpl +++ b/templates/alarm.tpl @@ -1,5 +1,5 @@ <!-- Start of second page: #alarm --> -<div data-role="page" id="new_alarm" data-add-back-btn="true"> +<div data-role="page" id="new_alarm" data-add-back-btn="false"> <div data-role="header" data-position="fixed"> <h1>Set alarm</h1> @@ -25,9 +25,13 @@ <input placeholder="00" class="customDuration" type="number" name="radio-choice" value="0" min="0" max="99" id="customDuration"/> <label class="customDuration" for="customDuration">minute(s) before</label> - <a href="#new_event" id="add-alarm" data-role="button">Save</a> </div><!-- /content --> <div data-role="footer" data-position ="fixed"> + <div data-role="tabbar" data-style="tabbar" > + <ul> + <li><a href="#new_event" id="add-alarm">Save</a></li> + </ul> + </div> </div><!-- /footer --> </div><!-- /page alarm -->
\ No newline at end of file diff --git a/templates/new_event.tpl b/templates/new_event.tpl index 78c9bef..723c6b4 100644 --- a/templates/new_event.tpl +++ b/templates/new_event.tpl @@ -46,8 +46,8 @@ <div data-role="footer" data-position="fixed"> <div data-role="tabbar" data-style="tabbar"> <ul> - <li><a id="add-event-btn" data-inline="true">OK</a></li> <li><a id="add-event-cancel-btn" data-inline="true">Cancel</a></li> + <li><a id="add-event-btn" data-inline="true">OK</a></li> </ul> </div><!-- /controlbar --> </div><!-- /footer --> @@ -59,12 +59,13 @@ </div> </div> - <div id="center_info" data-role="popup" data-style="center_info"> - <div data-role="text"><p> - Pop-up dialog box, a child - window that blocks user inter- - act to the parent windows - </p></div> + <div id="center_info" data-role="popup" class="center_title_1btn"> + <div class="ui-popup-text"> + <p> End date cannot be earlier than initial date </p> + </div> + <div class="ui-popup-button-bg"> + <a data-role="button" id="close">Close</a> + </div> </div> </div><!-- /new_event --> |