[TizenWinset]update TizenWinset(tizen_2.1)

Change-Id: I9376dd16da6491b1940e575a25f3421993772eda

diff --git a/widgets/checkbox/checkbox.html b/widgets/checkbox/checkbox.html
index b32c10d..1c2a8e2 100644 (file)
--- a/widgets/checkbox/checkbox.html
+++ b/widgets/checkbox/checkbox.html
@@ -25,7 +25,7 @@
                                <div class="content-primary">
                                        <div class="my-check-button-style"><a id="check-1" data-role="button" data-inline="true">Check/UnCheck</a></div>
                                        <div class="my-check-button-style my-check-inline-style"><a id="get-check-value" data-role="button" data-inline="true">Get Check Value</a></div>
-                                       <p>First checkbox check value :
+                                       <p>First checkbox check value : <br>
                                                <span class="checked-value">
                                                        <em>(click the button! )</em>
                                                </span>
@@ -37,19 +37,19 @@
                                                </span>
                                        </p>
                                        <hr/>
-                                       <fieldset data-role="controlgroup">
+                                       <fieldset data-role="controlgroup" class="my-check-controlgroup">
                                                <input type="checkbox" name="checkbox-1" id="checkbox-1"/>
                                                <label for="checkbox-1">Normal</label>
                                                <input type="checkbox" name="checkbox-2" id="checkbox-2" checked="checked" disabled="disabled" />
                                                <label for="checkbox-2">Checked, Disabled</label>
                                                <input type="checkbox" name="checkbox-3" id="checkbox-3" disabled="disabled" />
-                                               <label for="checkbox-3">Disabled</label>
+                                               <label for="checkbox-3">Disabled</label><br>
                                                <input type="checkbox" name="checkbox-4" id="checkbox-4" class="favorite" />
                                                <label for="checkbox-4">Favorite</label>
                                                <input type="checkbox" name="checkbox-5" id="checkbox-5" checked="checked" disabled="disabled" class="favorite" />
                                                <label for="checkbox-5">Favorite Checked, Disabled</label>
                                                <input type="checkbox" name="checkbox-6" id="checkbox-6" disabled="disabled" class="favorite" />
-                                               <label for="checkbox-6">Favorite, Disabled</label>
+                                               <label for="checkbox-6">Favorite, Disabled</label><br>
                                                <input type="checkbox" name="checkbox-7" id="checkbox-7" />
                                                <input type="checkbox" name="checkbox-8" id="checkbox-8" />
                                        </fieldset>

diff --git a/widgets/checkbox/styles.css b/widgets/checkbox/styles.css
index e577ed2..b38fdba 100644 (file)
--- a/widgets/checkbox/styles.css
+++ b/widgets/checkbox/styles.css
@@ -3,4 +3,9 @@
 }
 .my-check-inline-style {
        display: inline;
+}
+
+.my-check-controlgroup div.ui-checkbox {
+       margin-top : 3px;
+       margin-bottom : 3px;
 }
\ No newline at end of file

diff --git a/widgets/ctxpopup.html b/widgets/ctxpopup.html
index 93a79e4..dc41eb2 100644 (file)
--- a/widgets/ctxpopup.html
+++ b/widgets/ctxpopup.html
@@ -165,8 +165,6 @@
                                                <li><a href="#" data-rel="back">Add to contact</a></li>
                                                <li><a href="#" data-rel="back">Call log</a></li>
                                                <li><a href="#" data-rel="back">Music</a></li>
-                                               <li><a href="#" data-rel="back">File manager</a></li>
-                                               <li><a href="#" data-rel="back">Internal Link</a></li>
                                        </ul>
                                </div>
                        </div>

diff --git a/widgets/grid/namecard.css b/widgets/grid/namecard.css
index f8a3b0d..e8f7be7 100644 (file)
--- a/widgets/grid/namecard.css
+++ b/widgets/grid/namecard.css
@@ -35,7 +35,6 @@
 }
 
 .ui-demo-namecard-contents span {
-       font-style : italic;
        color : #666;
        border-bottom : 1px dashed;
        margin-top: 0rem;
@@ -57,8 +56,7 @@
 
 .ui-demo-namecard-span-x {
        color : gray;
-       font : normal 0.6rem Georgia, serif !important;
-
+       font-size : 0.6rem;
        width: 5rem;
        display: block;
        white-space : nowrap;
@@ -70,7 +68,7 @@
 
 .ui-demo-namecard-contents span.name {
        color : gray;
-       font : normal 0.6rem Georgia, serif !important;
+       font-size : 0.6rem;
        width: 4rem;
        display: inline-block;
        white-space : nowrap;
@@ -109,9 +107,8 @@
 .ui-demo-namecard-list-contents span{
        left : 9.6rem;
        font-weight : normal;
-       font-size : 0.9rem;
+       font-size : 0.8rem;
        color : gray;
        padding-top : 1rem;
-       font-family: Helvetica, Arial, sans-serif;
        margin-top: 0rem;
 }

diff --git a/widgets/naviframe/naviframe_footer_more.html b/widgets/naviframe/naviframe_footer_more.html
index fb60016..b074648 100644 (file)
--- a/widgets/naviframe/naviframe_footer_more.html
+++ b/widgets/naviframe/naviframe_footer_more.html
@@ -34,8 +34,6 @@
                        <li><a href="#" data-rel="back">Add to contact</a></li>
                        <li><a href="#" data-rel="back">Call log</a></li>
                        <li><a href="#" data-rel="back">Music</a></li>
-                       <li><a href="#" data-rel="back">File manager</a></li>
-                       <li><a href="#" data-rel="back">Internal Link</a></li>
                </ul>
        </div>
 </div>

diff --git a/widgets/naviframe/naviframe_footer_more_button.html b/widgets/naviframe/naviframe_footer_more_button.html
index 1a4c8ea..01a63ac 100644 (file)
--- a/widgets/naviframe/naviframe_footer_more_button.html
+++ b/widgets/naviframe/naviframe_footer_more_button.html
@@ -37,7 +37,6 @@
                        <li><a href="#" data-rel="back">Add to contact</a></li>
                        <li><a href="#" data-rel="back">Call log</a></li>
                        <li><a href="#" data-rel="back">Music</a></li>
-                       <li><a href="#" data-rel="back">File manager</a></li>
                </ul>
        </div>
 </div>

diff --git a/widgets/popupwindow/popupwindow.js b/widgets/popupwindow/popupwindow.js
index 16f93dd..f62f272 100644 (file)
--- a/widgets/popupwindow/popupwindow.js
+++ b/widgets/popupwindow/popupwindow.js
@@ -4,6 +4,13 @@ $( document ).one( "pageinit", "#popupwindow-demo", function () {
                $("#textbox_popup").popup("close");
                return false;
        });
+
+       if ( $.tizen.__tizen__.util.isMobileBrowser() ) {
+                var direction = window.screen.orientation;
+                if ( direction === "landscape-primary" || direction === "landscape-secondary" ) {
+                        $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup_landscape" );
+                }
+        }
 });
 
 function onSuccessPopupCallback ( ori ) {

diff --git a/widgets/tabbar/tabbar_footer_more.html b/widgets/tabbar/tabbar_footer_more.html
index 69fb63b..deba94c 100644 (file)
--- a/widgets/tabbar/tabbar_footer_more.html
+++ b/widgets/tabbar/tabbar_footer_more.html
@@ -27,16 +27,14 @@
        </div>
 
        <div data-role="footer">
-               <a href="#pop_js" data-role="button"  data-icon="naviframe-more" data-rel="popupwindow"></a>
+               <a href="#pop_js" data-role="button"  data-icon="naviframe-more" data-rel="popup"></a>
 
-               <div id="pop_js" data-role="popupwindow" data-show-arrow="true">
+               <div id="pop_js" data-role="popup" >
                        <ul data-role="listview">
-                               <li><a href="#" class="ui-btn-ctxpopup-close">Settings</a></li>
-                               <li><a href="#" class="ui-btn-ctxpopup-close">Add to contact</a></li>
-                               <li><a href="#" class="ui-btn-ctxpopup-close">Call log</a></li>
-                               <li><a href="#" class="ui-btn-ctxpopup-close">Music</a></li>
-                               <li><a href="#" class="ui-btn-ctxpopup-close">File manager</a></li>
-                               <li><a href="#" class="ui-btn-ctxpopup-close">Internal Link</a></li>
+                               <li><a href="#" data-rel="back">Settings</a></li>
+                               <li><a href="#" data-rel="back">Add to contact</a></li>
+                               <li><a href="#" data-rel="back">Call log</a></li>
+                               <li><a href="#" data-rel="back">Music</a></li>
                        </ul>
                </div>
                <div data-role="tabbar">
@@ -44,7 +42,6 @@
                                <li><a href="#"class="ui-btn-active">MENU</a></li>
                                <li><a href="#">SAVE</a></li>
                                <li><a href="#">SHARE</a></li>
-
                        </ul>
                </div>
        </div>

diff --git a/widgets/tabbar/tabbar_footer_segment_more.html b/widgets/tabbar/tabbar_footer_segment_more.html
index 34be34d..30d4b8e 100644 (file)
--- a/widgets/tabbar/tabbar_footer_segment_more.html
+++ b/widgets/tabbar/tabbar_footer_segment_more.html
@@ -26,18 +26,15 @@
        </div>
 
        <div data-role="footer">
-               <a href="#pop_js" data-role="button"  data-icon="naviframe-more" data-rel="popupwindow"></a>
+               <a href="#pop_js" data-role="button"  data-icon="naviframe-more" data-rel="popup"></a>
 
-               <div id="pop_js" data-role="popupwindow" data-show-arrow="true">
+               <div id="pop_js" data-role="popup">
                <ul data-role="listview">
-                       <li><a href="#" class="ui-btn-ctxpopup-close">Settings</a></li>
-                       <li><a href="#" class="ui-btn-ctxpopup-close">Add to contact</a></li>
-                       <li><a href="#" class="ui-btn-ctxpopup-close">Call log</a></li>
-                       <li><a href="#" class="ui-btn-ctxpopup-close">Music</a></li>
-                       <li><a href="#" class="ui-btn-ctxpopup-close">File manager</a></li>
-                       <li><a href="#" class="ui-btn-ctxpopup-close">Internal Link</a></li>
-               </ul>
-
+                               <li><a href="#" data-rel="back">Settings</a></li>
+                               <li><a href="#" data-rel="back">Add to contact</a></li>
+                               <li><a href="#" data-rel="back">Call log</a></li>
+                               <li><a href="#" data-rel="back">Music</a></li>
+                       </ul>
                </div>
                <div data-role="controlgroup" data-type="horizontal">
                        <a href="#" data-role="button">BACK</a>