From 1f3d87efacdd0fc662bbf065749ca9deb50e205a Mon Sep 17 00:00:00 2001
From: Riasan <riasan@ryzom.com>
Date: Tue, 24 Aug 2021 20:51:53 +0200
Subject: [PATCH] Changed: modify login ui + new urls for account buttons

---
 .../data/gamedev/interfaces_v3/login_main.xml | 15 ++++-----
 .../gamedev/interfaces_v3/login_widgets.xml   | 32 +++++++++----------
 .../gamedev/interfaces_v3/out_v2_appear.xml   |  4 +--
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
index 520a7190e..bd8f25880 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
@@ -10,7 +10,6 @@
 
 <variable entry="UI:VARIABLES:DISPLAY_ACCOUNT_BUTTONS" type="sint32" value="-1" />
 
-
 <proc id="top_center">
   <action handler="set" params="target='@0:x'|value=div(sub(getprop('ui:login:w'),getprop('@0:w')),2)" />
   <action handler="set" params="target='@0:y'|value=getprop('ui:login:h')" />
@@ -89,7 +88,7 @@
 
     <!-- Create Account -->
     <ctrl style="log_std_but" id="but_create_account" posparent="but_log" posref="BM TM" y="-28"
-    onclick_l="on_create_account" hardtext="uiCreateAccount" />
+    onclick_l="open_url" params_l="cfg_CreateAccountURL" hardtext="uiCreateAccount" />
 
 	<!-- Edit Account -->
     <ctrl style="log_std_but" id="but_edit_account" posparent="but_create_account" posref="BM TM" y="-8"
@@ -133,7 +132,7 @@
 																but_login_support:active" />
 
     <!-- RESOLUTION ET LEVEL OF DETAILS -->
-    <instance template="server_box" id="res_win" posparent="window" posref="TL TL" w="276" h="24" y="-733" x="10"/>
+    <instance template="server_box" id="res_win" posparent="window" posref="TL TL" w="276" h="24" y="-733" x="10" />
     <instance template="server_box" id="lod_win" posparent="res_win" posref="TR TL" w="276" h="24" x="16" />
     <instance template="server_box" id="ver_win" posparent="lod_win" posref="TR TL" w="276" h="24" x="26" />
 	<!-- Game Configuration -->
@@ -639,7 +638,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 <style style="log_url" type="text_button" button_type="toggle_button"
 		tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16"
 		color="255 255 255 0" col_over="255 255 255 0" col_pushed="255 255 255 0"
-		text_y="-6" text_underlined="true" fontsize="10" shadow="true"
+		text_y="0" text_underlined="true" fontsize="10" shadow="true"
 		text_color_normal="255 255 255 255" text_color_over="100 255 100 255" text_color_pushed="255 255 255 255"
 	    text_shadow_color_normal="0 0 0 255"
 	    text_shadow_color_pushed="0 0 0 255"
@@ -693,7 +692,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 		<view type="text" id="txt_pas" posparent="txt_log" posref="BL TL" hardtext="uiPassword" fontsize="12" x="0" y="-30" color="255 255 255 255" />
 
 		<instance template="edit_box_log" id="eb_password" posparent="txt_pas" posref="BL BL" w="250" h="26" fontsize="12" x="200" y="0"
-		text_ref="BM BM" text_y="-2"
+		text_ref="BM BM" text_y="0"
 		on_focus="create_account_rules" on_focus_params="rules_password" reset_focus_on_hide="false"  max_historic="0" entry_type="password"
 		onenter="set_keyboard_focus" params="target=ui:login:create_account:content:submit_gr:eb_confirm_password:eb|select_all=false"
 		prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="60" color="135 243 28 255" />
@@ -702,7 +701,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 		<view type="text" id="txt_confirm_pas" posparent="txt_pas" posref="BL TL" hardtext="uiConfirmPassword" fontsize="12" x="0" y="-30" color="255 255 255 255" />
 
 		<instance template="edit_box_log" id="eb_confirm_password" posparent="txt_confirm_pas" posref="BL BL" w="250" h="26" fontsize="12" x="200" y="0"
-		text_ref="BM BM" text_y="-2"
+		text_ref="BM BM" text_y="0"
 		on_focus="create_account_rules" on_focus_params="rules_password_conf" reset_focus_on_hide="false"  max_historic="0" entry_type="password"
 		onenter="set_keyboard_focus" params="target=ui:login:create_account:content:submit_gr:eb_email:eb|select_all=false"
 		prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="60" color="135 243 28 255" />
@@ -732,7 +731,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 		<!-- *** WELCOME/ERRORS *** -->
 		<!-- ********************** -->
 
-		<instance template="log_box_blank" id="welcome_errors_gr" posparent="eb_login" posref="TR TL" h="165" w="260" x="20" y="0"
+		<instance template="log_box_blank" id="welcome_errors_gr" posparent="eb_login" posref="TR TL" h="180" w="260" x="20" y="0"
 		 blackColor="0 0 0 255" whiteColor="255 255 255 255" />
 
 		<group id="erros_txt" posparent="welcome_errors_gr" posref="TL TL" x="8" y="-8" sizeref="w" child_resize_h="true"
@@ -748,7 +747,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 		<!-- ********************** -->
 		<!-- ******* RULES ******** -->
 		<!-- ********************** -->
-		<instance template="server_box" id="rules_gr" posref="BL BL" w="740" h="80" y="70" />
+		<instance template="server_box" id="rules_gr" posref="BL BL" w="800" h="80" y="70" />
 
 		<!-- login rules -->
 		<view type="text" id="rules_login" active="false" posparent="rules_gr" multi_line="true" line_maxw="720" posref="TL TL" hardtext="login rules" fontsize="8" x="10" y="-10"  color="255 255 255 255" />
diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index c9744cee0..37c62b2a1 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -34,7 +34,7 @@
 </template>
 
 <template name="server_box" posref="TL TL" x="0" y="0" w="64" h="16"  id="" posparent="parent" sizeref="" keep="true" >
-	<group id="#id" posparent="#posparent" posref="#posref" w="#w" h="#h" x="#x" y="#y" sizeref="#sizeref" >
+	<group id="#id" posparent="#posparent" posref="#posref" w="#w" h="#h" x="#x" y="#y" sizeref="#sizeref">
 		<group id="bg" sizeref="hw" h="0" w="0" />
 		<view type="bitmap" id="bk" scale="true" posparent="bg" posref="MM MM" sizeref="hw" w="-16" h="-16" texture="log_eb_m.tga" />
 		<view type="bitmap" id="tl" texture="log_eb_tl.tga" posref="TL TL" />
@@ -210,7 +210,7 @@
 <style style="log_std_but" type="text_button" button_type="push_button" 
 		tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16" 
 		color="255 255 255 160" col_over="255 255 255 255" col_pushed="255 255 255 255"
-		text_y="-1" fontsize="10" shadow="true"
+		text_y="0" fontsize="10" shadow="true"
 		text_color_normal="135 243 28 160" 
 	    text_color_pushed="135 243 28 255" 
 	    text_color_over="135 243 28 255" 
@@ -222,7 +222,7 @@
 <style style="log_spe_but" type="text_button" button_type="push_button" 
 		tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16" wmin="552"
 		color="255 255 255 160" col_over="255 255 255 255" col_pushed="255 255 255 255"
-		text_y="-3" fontsize="10" shadow="true"
+		text_y="0" fontsize="10" shadow="true"
 		text_color_normal="135 243 28 160" 
 	    text_color_pushed="135 243 28 255" 
 	    text_color_over="135 243 28 255" 
@@ -235,7 +235,7 @@
 <style style="server_note" type="text_button" button_type="push_button" 
 		tx_normal="serv_note" tx_pushed="serv_note" tx_over="serv_note_over" wmargin="16"
 		color="255 255 255 160" col_over="255 255 255 255" col_pushed="255 255 255 255"
-		text_y="-3" fontsize="10" shadow="true"
+		text_y="0" fontsize="10" shadow="true"
 		text_color_normal="135 243 28 160" 
 	    text_color_pushed="135 243 28 255" 
 	    text_color_over="135 243 28 255" 
@@ -607,7 +607,7 @@
 <style style="button_ok" type="text_button" id="ok" button_type="push_button" 		
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8" />
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8" />
 
 <!-- Common Style for a Cancel Button. By default positioned according to the "ok" button. User should define:
 	- "onclick_l" and "params_l"
@@ -615,7 +615,7 @@
 <style style="button_cancel" type="text_button" id="cancel" button_type="push_button"
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper"	wmargin="8" />
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper"	wmargin="8" />
 
 
 <!-- Group of two ok, cancel buttons
@@ -686,14 +686,14 @@
 <style style="text_button_16" type="text_button" button_type="push_button"
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
 		text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" />
 
 
 <style style="new_element_header" type="text_button" button_type="push_button" 
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
 		global_color_normal="false" global_color_over="false" global_color_pushed="false" 
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
 		text_global_color_normal="false" text_global_color_pushed="false" text_global_color_over="false"
 		text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" 
 		text_header_color="true" />
@@ -701,7 +701,7 @@
 
 <style style="new_element_content" type="text_button" button_type="push_button" 
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
 		text_global_color_normal="true" text_global_color_pushed="true" text_global_color_over="true"
 		text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" />
@@ -711,7 +711,7 @@
 		tx_normal="qh_off" tx_pushed="qh_on" tx_over="qh_off" wmin="208" wmargin="8"
 		global_color_normal="true" global_color_over="true" global_color_pushed="false" 
 		color="255 255 255 128" col_over="255 255 255 0" col_pushed="255 128 0 192"
-		text_y="-2" fontsize="12" shadow="true"
+		text_y="0" fontsize="12" shadow="true"
 		text_color_normal="255 255 255 255" 
 	    text_color_pushed="255 255 255 255" 
 	    text_color_over="255 255 255 255" 
@@ -726,7 +726,7 @@
 		tx_normal="qh_off" tx_pushed="qh_on" tx_over="qh_off" wmin="104" wmargin="8"
 		global_color_normal="true" global_color_over="true" global_color_pushed="false" 
 		color="255 255 255 128" col_over="255 255 255 0" col_pushed="255 128 0 192"
-		text_y="-2" fontsize="12" shadow="true"
+		text_y="0" fontsize="12" shadow="true"
 		text_color_normal="255 255 255 255" 
 	    text_color_pushed="255 255 255 255" 
 	    text_color_over="255 255 255 255" 
@@ -742,7 +742,7 @@
 		tx_normal="qh_off" tx_pushed="qh_off" tx_over="qh_off" wmin="104" wmargin="8"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
 		color="255 255 255 128" col_over="255 255 255 0" col_pushed="255 255 255 128"
-		text_y="-2" fontsize="12" shadow="true"
+		text_y="0" fontsize="12" shadow="true"
 		text_color_normal="255 255 255 255" 
 	    text_color_pushed="255 255 255 255" 
 	    text_color_over="255 255 255 255" 
@@ -757,7 +757,7 @@
 		tx_normal="qh_off" tx_pushed="qh_on" tx_over="qh_off" wmin="86" wmargin="8"
 		global_color_normal="true" global_color_over="true" global_color_pushed="false" 
 		color="255 255 255 128" col_over="255 255 255 0" col_pushed="255 190 0 192"
-		text_y="-3" fontsize="12" shadow="true"
+		text_y="0" fontsize="12" shadow="true"
 		text_color_normal="255 255 255 160" 
 	    text_color_pushed="255 255 255 255" 
 	    text_color_over="255 255 255 255" 
@@ -779,7 +779,7 @@
 		tx_normal="Quit_button_normal" tx_pushed="Quit_button_pushed" tx_over="Quit_button_over" wmargin="12"
 		global_color_normal="false" global_color_over="false" global_color_pushed="false" 
 		color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255"
-		text_y="-3" fontsize="14" shadow="true"
+		text_y="0" fontsize="14" shadow="true"
 		text_color_pushed="255 255 255 255" 
 	    text_color_over="255 255 255 255"
 		text_shadow_color_normal="0 0 0 255" 
@@ -800,7 +800,7 @@
 		x="-2" posref="TR TL"
 		tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true" 
-		text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
 		text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" />
 		
 <style style="tab_button_new" type="tab_button" button_type="radio_button"
@@ -808,7 +808,7 @@
 		tx_normal="w_tab_normal" tx_pushed="w_tab_pushed" tx_over="w_tab_over"
 		global_color_normal="true" global_color_over="true" global_color_pushed="true"
 		color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255"
-		text_y="-4" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
+		text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
 		text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255"
 		text_global_color_normal="true" 
 	    text_global_color_pushed="false" 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index ed878bae1..6f7f7d500 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -1289,9 +1289,7 @@
 	<!-- NamingPolicy -->
 	<ctrl style="opt_button" id="name_policy" posref="BM BM" posparent="text" x="0" y="-40" hardtext="uiCP_Name_Policy"
 		text_color_over="208 258 16 255" text_color_normal="255 255 46 255" text_color_pushed="108 158 16 255"
-		onover="play_sound" params_over="name=specie_but_over"
-		onclick_l="open_url" params_l="cfg_ConditionsTermsURL" />
-		<!-- onclick_l="open_url" params_l="cfg_NamingPolicyURL" /> -->
+		onclick_l="open_url" params_l="cfg_NamingPolicyURL" />
 
 	<group type="edit_box" id="eb" posparent="name_policy" posref="BM TM" x="0" y="-8"  w="300" h="52" render_layer="4" child_resize_h="true"
 									onenter="proc" params="proc_appear_name_enter"