projects / samples / web / Systeminfo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ac556a)
[Systeminfo]update Systeminfo(tizen_2.1)
authorgs86.lee <gs86.lee@samsung.com>
Fri, 12 Apr 2013 06:30:30 +0000 (15:30 +0900)
committergs86.lee <gs86.lee@samsung.com>
Fri, 12 Apr 2013 06:30:30 +0000 (15:30 +0900)
Change-Id: I0333511fdfbcdba2c8a3cb296fab97979c5d8a51

NOTICE [new file with mode: 0644] patch | blob
config.xml patch | blob | history
index.html patch | blob | history
js/main.js patch | blob | history

diff --git a/NOTICE b/NOTICE
new file mode 100644 (file)
index 0000000..85044e4
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,4 @@
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.
+Please, see the LICENSE.Flora file for Flora License terms and conditions.
+
diff --git a/config.xml b/config.xml
index ac05bcd..13f9422 100755 (executable)
--- a/config.xml
+++ b/config.xml
@@ -4,8 +4,7 @@
        <name>Systeminfo</name>
        <icon src="icon.png"/>
        <content src="index.html"/>
-       <tizen:privilege name="http://tizen.org/privilege/tizen" />
        <tizen:privilege name="http://tizen.org/privilege/application.read" />
        <tizen:privilege name="http://tizen.org/privilege/systeminfo" />
-       <tizen:application id="samplesysi" required_version="1.0"/>
+       <tizen:application id="samplesysi.Systeminfo" package="samplesysi" required_version="2.1"/>
 </widget>
diff --git a/index.html b/index.html
index 8770d07..73f21e2 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -4,10 +4,10 @@
        <meta charset="utf-8"/>
        <meta name="description" content="Systeminfo API Tutorial"/>
        <title>Systeminfo</title>
-       <script src="/usr/share/tizen-web-ui-fw/latest/js/jquery.js"></script>
+       <script src="/usr/share/tizen-web-ui-fw/latest/js/jquery.min.js"></script>
        <script src="./js/config.js"></script>
-       <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.js"></script>
-       <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.js" data-framework-viewport-scale="false"></script>
+       <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
+       <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js" data-framework-viewport-scale="false"></script>
        <script type="text/javascript" src="./js/main.js"></script>
        <link rel="stylesheet" type="text/css" href="./css/style.css"/>
 </head>
@@ -15,7 +15,7 @@
 <body>
        <div data-role="page" id="main" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>System Information</h1>
+                       <h1>SYSTEM INFORMATION</h1>
                </div>
 
                <div data-role="content">
@@ -29,9 +29,6 @@
                </div>
 
                <div data-role="footer" data-position="fixed">
-                       <div data-role=
-"tabbar" data-style="toolbar">
-                       </div>
                </div>
        </div>
 
diff --git a/js/main.js b/js/main.js
index 1b5cf19..2bfc5bc 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -72,7 +72,7 @@ function makeDividerListItem(value) {
 }
 
 function onStorageSuccess(storages) {
-       gInfoTitle = "Storages(" + storages.length + ")";
+       gInfoTitle = "STORAGES(" + storages.length + ")";
        gInfo = "";
        for (var i = 0; i < storages.length; i++) {
                gInfo += makeDividerListItem("Storage " + (i + 1))
@@ -86,7 +86,7 @@ function onStorageSuccess(storages) {
 }
 
 function onBatterySuccess(battery) {
-       gInfoTitle = "Battery";
+       gInfoTitle = "BATTERY";
        gInfo = make2lineListItem("Level", battery.level)
                        + make2lineListItem("Charging", (battery.isCharging == true ? "Yes" : "No"));
 
@@ -101,7 +101,7 @@ function onCpuInfoSuccess(cpu) {
 }
 
 function onDisplaySuccess(display) {
-       gInfoTitle = "Display";
+       gInfoTitle = "DISPLAY";
        gInfo = makeDividerListItem("Resolution")
                        + make2lineListItem("Width", display.resolutionWidth)
                        + make2lineListItem("Height", display.resolutionHeight)
@@ -118,7 +118,7 @@ function onDisplaySuccess(display) {
 }
 
 function onDeviceSuccess(device) {
-       gInfoTitle = "Device";
+       gInfoTitle = "DEVICE";
        gInfo = make2lineListItem("IMEI", device.imei)
                        + make2lineListItem("Model", device.model)
                        + make2lineListItem("Version", device.version)
@@ -128,7 +128,7 @@ function onDeviceSuccess(device) {
 }
 
 function onOrientationSuccess(orientation) {
-       gInfoTitle = "Device orientation";
+       gInfoTitle = "DEVICE ORIENTATION";
        gInfo = make2lineListItem("Status", orientation.status);
 
        $.mobile.changePage("#info");
Domain: Applications / Web Sample;