Fix listview style issue in some tests and bypass the tizen object in normal browser.

diff --git a/css/jquery.mobile.css b/css/jquery.mobile.css
index 0877c9c..3773a21 100644 (file)
--- a/css/jquery.mobile.css
+++ b/css/jquery.mobile.css
@@ -1432,7 +1432,7 @@ div.ui-mobile-viewport { overflow-x: hidden; }
 .ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
 .ui-footer .ui-title { margin: .6em 15px .8em; }
 /*content area*/
-.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 10px; }
+.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; }
 /* icons sizing */
 .ui-icon { width: 18px; height: 18px; }
 /* non-js content hiding */
@@ -2534,13 +2534,13 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
 .ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last { -webkit-border-bottom-left-radius: inherit; -webkit-border-bottom-right-radius: inherit; border-bottom-left-radius: inherit; border-bottom-right-radius: inherit; }
 .ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last .ui-li-link-alt { -webkit-border-bottom-right-radius: inherit; border-bottom-right-radius: inherit; }
 .ui-li>.ui-btn-inner { display: block; position: relative; padding: 0; }
-.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: .3em 8px; display: block; }
-.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-thumb  { min-height: 60px; padding-left: 40px; }
+.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: .7em 15px; display: block; }
+.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-thumb  { min-height: 60px; padding-left: 100px; }
 .ui-li-has-icon .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-icon { min-height: 20px; padding-left: 40px; }
 .ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-count, .ui-li-divider.ui-li-has-count { padding-right: 45px; }
-.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow { padding-right: 30px; }
-.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow.ui-li-has-count { padding-right: 85px; }
-.ui-li-heading { font-size: 14px; font-weight: bold; display: block; margin: .6em 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
+.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow { padding-right: 40px; }
+.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow.ui-li-has-count { padding-right: 75px; }
+.ui-li-heading { font-size: 16px; font-weight: bold; display: block; margin: .6em 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
 .ui-li-desc { font-size: 12px; font-weight: normal; display: block; margin: -.5em 0 .6em; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
 .ui-li-thumb, .ui-listview .ui-li-icon { position: absolute; left: 1px; top: 0; max-height: 80px; max-width: 80px; }
 .ui-listview .ui-li-icon { max-height: 16px; max-width: 16px; left: 10px; top: .9em; }

diff --git a/css/main.css b/css/main.css
index 33b19f1..88aa9da 100644 (file)
--- a/css/main.css
+++ b/css/main.css
@@ -29,8 +29,15 @@ Authors:
         Fan, Yugang <yugang.fan@intel.com>
 
 */
-.ui-page .ui-content .ui-listview h2 {
-    line-height : 40px;
+.ui-page .ui-content .ui-listview img {
+    position:absolute;
+    top:0;
+    bottom:0;
+    margin:auto;
+}
+
+.ui-page .ui-content .ui-listview h1 {
+    line-height : 45px;
     vertical-align : middle;
     white-space : normal;
 }
@@ -40,13 +47,6 @@ Authors:
     text-align: center;
 }
 
-.ui-page .ui-content .ui-listview img {
-    position:absolute;
-    top:0;
-    bottom:0;
-    margin:auto;
-}
-
 #overlay {
     position: fixed;
     top: 0;

diff --git a/js/main.js b/js/main.js
index c50e500..f9a0c1a 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -40,6 +40,13 @@ var resultFile = "tct-behavior-tests_" + getCurrentTime() + ".result.xml";
 var tmpResultFile = "tct-behavior-tests.tmpresult.xml";
 var isLaunching = false;
 
+function checkTizen(){
+    if (typeof(tizen) == 'undefined')
+        return false;
+    else
+        return true;
+}
+
 function updateToolTitle() {
     var version = '';
     $.ajax({
@@ -84,6 +91,13 @@ function runApp(url) {
     _timer = setTimeout(launchApp, 200);
 }
 
+function updateAppDecorationStyle() {
+    $(".ui-content").css("padding", '6px');
+    $("a.ui-link-inherit").css("padding", '0px 85px 0px 10px');
+    $(".ui-li-has-thumb a.ui-link-inherit").css("padding-left", '40px');
+    $(".ui-li-heading").css("font-size", '14px');
+}
+
 function updateAppDecoration() {
     $("#mylist").empty();
     $(_resultXML).find("set").each(
@@ -94,7 +108,7 @@ function updateAppDecoration() {
                      var url = "tests/" + $(this).attr("id") + "/index.html?test_name="+$(this).attr("purpose");
                      var appLine = "<li id=\"" + $(this).attr("id") + "\" class=\"test_app\">" +
                            "<a href=\"javascript:runApp('" + url + "')\">" +
-                           "<h2>" + $(this).attr("purpose") + "</h2></a></li>";
+                           "<h1>" + $(this).attr("purpose") + "</h1></a></li>";
                      $("#mylist").append(appLine);
                      if($(this).attr("result") == "PASS"){
                          $("#mylist > li :last").find("a").append("<img src='css/images/pass.png' class='ui-li-thumb'>");
@@ -118,6 +132,7 @@ function updateAppDecoration() {
         }
     );
     $("#mylist").listview( "refresh" );
+    updateAppDecorationStyle();
 }
 
 function exportResult() {
@@ -206,9 +221,11 @@ function SaveAndExit() {
     writeFile(resultFile, (new XMLSerializer()).serializeToString(_resultXML), true);
 }
 
-function updateFooterButton() {
+function updateBar() {
+    $(':jqmData(role=header)').removeClass("slidedown");
+    $(':jqmData(role=footer)').removeClass("slideup");
     $(':jqmData(role=footer)').attr("align", "center");
-    $(':jqmData(role=footer)').find(':jqmData(role=button) > span:first-child').css('padding', '15px 10px 15px 30px');
+    $(':jqmData(role=footer)').find(':jqmData(role=button) > span:first-child').css('padding', '15px 20px 15px 40px');
 }
 
 function loadTests() {
@@ -301,7 +318,7 @@ function recordResultToXML(test_name, result){
 }
 
 function initTests() {
-    updateFooterButton();
+    updateBar();
     loadTests();
     window.addEventListener('message', function(e) {
         console.log(e.data);
@@ -319,6 +336,10 @@ function initTests() {
 }
 
 function getSummary() {
+
+    if (!checkTizen())
+        return;
+
     var summaryXML = "";
 
     if (tizen.systeminfo == 'undefined') {