From: yonghwan82.jeon Date: Thu, 15 May 2014 06:06:48 +0000 (+0900) Subject: Merge remote-tracking branch 'origin/develop' into tizen X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80093ef08f98b947bf98e6aba378ebe67c0513c0;p=profile%2Fmobile%2Fsdk%2Fweb-ui-builder-template.git Merge remote-tracking branch 'origin/develop' into tizen * origin/develop: PROJTEMP : Update index.managed.js.xslt for widget does not have id. PROJECTEP : bugfix for manged_css. Modify page_managed_css file. PROJTEMP : Update image descriptor. PROJTEMP : Update image widget descriptor. PROJTEMP : Add display style. PROJTEMP : Modify javascript for widget position. Merge remote-tracking branch 'origin/tizen' into develop PROJTEMP : Update "modifyStyle" function. Merge remote-tracking branch 'origin/nscreen' into develop Conflicts: templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt Change-Id: If2236261c8b68ed8b1f7b88b07519308e0980fa9 Signed-off-by: yonghwan82.jeon --- 80093ef08f98b947bf98e6aba378ebe67c0513c0 diff --cc templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt index ba9a78d,370d42b..d11745d --- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt +++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt @@@ -111,4 -111,4 +111,4 @@@ -- ++ diff --cc templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt index ba9a78d,370d42b..d11745d --- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt +++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt @@@ -111,4 -111,4 +111,4 @@@ -- ++ diff --cc templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt index ba9a78d,370d42b..d11745d --- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt +++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt @@@ -111,4 -111,4 +111,4 @@@ -- ++ diff --cc templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt index ba9a78d,370d42b..d11745d --- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt +++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt @@@ -111,4 -111,4 +111,4 @@@ -- ++