Fixed authentication popup of circle

diff --git a/runtime/browser/popup.cc b/runtime/browser/popup.cc
index 06fe2a9..c5e81e9 100644 (file)
--- a/runtime/browser/popup.cc
+++ b/runtime/browser/popup.cc
@@ -174,26 +174,25 @@ Popup* Popup::CreatePopup(NativeWindow* window) {
   elm_object_style_set(popup, kStylePopup);
 
   Evas_Object* layout = elm_layout_add(popup);
-  elm_layout_theme_set(layout, "layout", "popup", kLayoutTheme);
 #ifdef MODEL_FORMFACTOR_CIRCLE
+  elm_layout_theme_set(layout, "layout", "popup", kLayoutTheme);
   elm_object_content_set(popup, layout);
 
   Evas_Object* box = elm_box_add(layout);
-  elm_box_padding_set(box, 0, 10);
-  evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-  evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-  elm_object_part_content_set(layout, "elm.swallow.content", box);
-  evas_object_show(box);
 #else
-  //elm_object_content_set(popup, layout);
-
   Evas_Object* box = elm_box_add(popup);
+#endif  // MODEL_FORMFACTOR_CIRCLE
+
   elm_box_padding_set(box, 0, 10);
   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+#ifdef MODEL_FORMFACTOR_CIRCLE
+  elm_object_part_content_set(layout, "elm.swallow.content", box);
+#else
   elm_object_part_content_set(popup, "default", box);
-  evas_object_show(box);
 #endif  // MODEL_FORMFACTOR_CIRCLE
+  evas_object_show(box);
 
   evas_object_event_callback_add(popup, EVAS_CALLBACK_RESIZE, NULL, NULL);
 
@@ -307,7 +306,9 @@ void Popup::SetBody(const std::string& str_id) {
   Evas_Object* label = elm_label_add(box_);
   elm_object_style_set(label, kStyleLabel);
   elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
-  elm_object_part_text_set(label, kContentText, str_id.c_str());
+  elm_object_domain_translatable_part_text_set(
+                                   label, kContentText, kTextDomainRuntime,
+                                   elm_entry_utf8_to_markup(str_id.c_str()));
   evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
   evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
 #ifdef MODEL_FORMFACTOR_CIRCLE

diff --git a/runtime/browser/web_application.cc b/runtime/browser/web_application.cc
index ef09759..435f9d8 100644 (file)
--- a/runtime/browser/web_application.cc
+++ b/runtime/browser/web_application.cc
@@ -1063,7 +1063,7 @@ void WebApplication::OnCertificateAllowRequest(
   popup->SetButtonType(Popup::ButtonType::AllowDenyButton);
   popup->SetTitle(popup_string::kPopupTitleCert);
   popup->SetBody(popup_string::GetText(
-                 popup_string::kPopupBodyCert)+" ["+url+"]");
+                 popup_string::kPopupBodyCert) + "\n\n" + url);
   popup->SetCheckBox(popup_string::kPopupCheckRememberPreference);
   popup->SetResultHandler(
       [db, result_handler, pem](Popup* popup, void* /*user_data*/) {

diff --git a/runtime/resources/xwalk_tizen.edc b/runtime/resources/xwalk_tizen.edc
index cc3c65c..a48c190 100755 (executable)
--- a/runtime/resources/xwalk_tizen.edc
+++ b/runtime/resources/xwalk_tizen.edc
@@ -111,17 +111,20 @@ collections {
                 scale: 1;
                 description {
                     state: "default" 0.0;
+                    align: 0.0 0.0;
+                    min: 0 40;
                     fixed: 1 1;
                     color: 168 168 168 255;
                     rel1 {
                         relative: 0.0 0.0;
                     }
                     rel2 {
-                        relative: 0.25 1.0;
+                        relative: 1.0 1.0;
                     }
                     text {
-                        font : "Tizen tyle=Medium";
+                        font : "Tizen:style=Medium";
                         size : 15;
+                        align: 0.0 0.3;
                     }
                 }
             }
@@ -131,12 +134,14 @@ collections {
                 scale: 1;
                 description {
                     state: "default" 0.0;
+                    align: 0.0 0.0;
+                    min: 0 40;
                     fixed: 1 1;
                     rel1 {
-                        relative: 0.3 0.0;
+                        relative: 0.0 0.5; to: "entry.text";
                     }
                     rel2 {
-                        relative: 0.7 1.0;
+                        relative: 1.0 1.0; to: "entry.text";
                     }
                 }
             }