From eb15b6f93618f34516e00d3ba96237fde8663f58 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 28 Jun 2012 17:55:10 -0400
Subject: Remove redundant "create_account_url" string from panel_login.xml. We
 already have a "create_account_url" string in strings.xml, and in fact --
 according to Eli -- the strings.xml values are "better" for non-English
 languages. Unfortunately those "better" strings weren't being used. They were
 tied to the FirstRun notification, which seems to have been disengaged.
 Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml
 when clicking the "Sign Up" link on the login panel.

---
 indra/newview/skins/default/xui/da/panel_login.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/da/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 2e0f726e1a..d43475677b 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
-- 
cgit v1.2.3


From da69ec0138c818cd5c0668b10ec977d87a10fdd3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Jul 2012 16:20:39 -0400
Subject: Try to adapt non-English panel_login.xml files for Leo's new layout.
 en/panel_login.xml had to be changed to enlarge certain fields for other
 languages (rather than overriding sizes in each of several other languages).
 Still need to translate new create_account_text and verify guessed
 log_in_text.

---
 indra/newview/skins/default/xui/da/panel_login.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/da/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index d43475677b..a5b101efc4 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -5,6 +5,9 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				LOG PÅ
+			</text>
 			<text name="username_text">
 				Brugernavn:
 			</text>
@@ -29,17 +32,15 @@
 				<combo_box.item label="Hjem" name="MyHome"/>
 				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
 			</combo_box>
-		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Opret bruger
-			</text>
 			<text name="forgot_password_text">
 				Har du glemt brugernavn eller password?
 			</text>
-			<text name="login_help">
-				Hjælp til login
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREATE YǾUR ACCǾUNT
 			</text>
+			<button name="create_new_account_btn" label="Opret bruger"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
-- 
cgit v1.2.3


From 149598bd57ad7a0e6703c49355c6d51ba4c55202 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 17 Jul 2012 16:24:58 -0400
Subject: Reinstate "Need help logging in?" link rather than question-diamond.
 Revert to corresponding original login_help text for each affected language.

---
 indra/newview/skins/default/xui/da/panel_login.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/da/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index a5b101efc4..c2fd3c44c7 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -32,6 +32,9 @@
 				<combo_box.item label="Hjem" name="MyHome"/>
 				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Hjælp til login
+			</text>
 			<text name="forgot_password_text">
 				Har du glemt brugernavn eller password?
 			</text>
-- 
cgit v1.2.3


From f7449bdc570e97a2ded2864779c72cce7f52e608 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 18 Jul 2012 14:47:16 -0400
Subject: Make "Log In" button (etc.) move with start/grid combo visibility.
 The "Start at:" combo box and the grid-selector box can be turned on and off
 with checkboxes on the Preferences floater. Break the bottom-left
 layout_panel on panel_login into several different layout_panels so when
 these UI elements disappear, other controls move left to fill the holes.
 Similarly, when you turn on either or both of the UI elements in question,
 the remaining controls in that general bottom-left area move right to
 accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect
 widgets' containment in new layout_panel elements. Discard obsolete
 "mode_selection_text" and "mode_combo" translations from non- English
 panel_login.xml overrides.

---
 indra/newview/skins/default/xui/da/panel_login.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/da/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index c2fd3c44c7..b7cb76d4cb 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Password:
 			</text>
-			<check_box label="Husk password" name="remember_check"/>
-			<button label="Log på" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Tilstand:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder.">
-				<combo_box.item label="Basis" name="Basic"/>
-				<combo_box.item label="Avanceret" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Start ved:
 			</text>
@@ -32,12 +25,16 @@
 				<combo_box.item label="Hjem" name="MyHome"/>
 				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
 			</combo_box>
+		</layout_panel>
+		<layout_panel name="links_login_panel">
 			<text name="login_help">
 				Hjælp til login
 			</text>
 			<text name="forgot_password_text">
 				Har du glemt brugernavn eller password?
 			</text>
+			<button label="Log på" name="connect_btn"/>
+			<check_box label="Husk password" name="remember_check"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">
-- 
cgit v1.2.3