From 27038a906e28ddff0af11d5b78cb6331824cf08b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 14 Sep 2014 19:39:06 -0400
Subject: [PATCH] update connect link text

---
 dashboard-ui/dlnaprofile.html    | 121 ++++++++++++++++---------------
 dashboard-ui/scripts/useredit.js |   9 ++-
 2 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index d08ac35688..a29244cc43 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -21,8 +21,6 @@
                     <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                         <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioInfo" value="tabInfo">
                         <label for="radioInfo">${TabInfo}</label>
-                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioIdentification" value="tabIdentification">
-                        <label for="radioIdentification">${TabIdentification}</label>
                         <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioDirectPlay" value="tabDirectPlayProfiles">
                         <label for="radioDirectPlay">${TabDirectPlay}</label>
                         <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioTranscoding" value="tabTranscodingProfiles">
@@ -66,6 +64,67 @@
 
 
                         <br />
+                        <div data-role="collapsible">
+                            <h2>${HeaderIdentification}</h2>
+                            <div>
+                                <br />
+                                <p>${HeaderIdentificationCriteriaHelp}</p>
+                                <br />
+                                <ul data-role="listview" class="ulForm">
+                                    <li>
+                                        <label for="txtIdFriendlyName">${LabelFriendlyName}</label>
+                                        <input type="text" id="txtIdFriendlyName" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdManufacturer">${LabelManufacturer}</label>
+                                        <input type="text" id="txtIdManufacturer" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdManufacturerUrl">${LabelManufacturerUrl}</label>
+                                        <input type="text" id="txtIdManufacturerUrl" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdModelName">${LabelModelName}</label>
+                                        <input type="text" id="txtIdModelName" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdModelNumber">${LabelModelNumber}</label>
+                                        <input type="text" id="txtIdModelNumber" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdModelDesription">${LabelModelDescription}</label>
+                                        <input type="text" id="txtIdModelDesription" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdModelUrl">${LabelModelUrl}</label>
+                                        <input type="text" id="txtIdModelUrl" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdSerialNumber">${LabelSerialNumber}</label>
+                                        <input type="text" id="txtIdSerialNumber" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtIdDeviceDescription">${LabelDeviceDescription}</label>
+                                        <input type="text" id="txtIdDeviceDescription" data-mini="true" />
+                                        <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                                    </li>
+                                </ul>
+
+                                <h2>
+                                    <span style="vertical-align:middle;">${HeaderHttpHeaders}</span>
+                                    <button class="btnAddIdentificationHttpHeader" data-icon="plus" data-iconpos="notext" data-inline="true" type="button" style="vertical-align:middle;margin-left:.25em;">${ButtonAdd}</button>
+                                </h2>
+                                <div class="httpHeaderIdentificationList"></div>
+                            </div>
+                        </div>
                         <div data-role="collapsible">
                             <h2>${HeaderDisplaySettings}</h2>
                             <div>
@@ -232,64 +291,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="tabContent tabIdentification">
-
-                        <p>${HeaderIdentificationCriteriaHelp}</p>
-                        <br />
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <label for="txtIdFriendlyName">${LabelFriendlyName}</label>
-                                <input type="text" id="txtIdFriendlyName" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdManufacturer">${LabelManufacturer}</label>
-                                <input type="text" id="txtIdManufacturer" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdManufacturerUrl">${LabelManufacturerUrl}</label>
-                                <input type="text" id="txtIdManufacturerUrl" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdModelName">${LabelModelName}</label>
-                                <input type="text" id="txtIdModelName" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdModelNumber">${LabelModelNumber}</label>
-                                <input type="text" id="txtIdModelNumber" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdModelDesription">${LabelModelDescription}</label>
-                                <input type="text" id="txtIdModelDesription" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdModelUrl">${LabelModelUrl}</label>
-                                <input type="text" id="txtIdModelUrl" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdSerialNumber">${LabelSerialNumber}</label>
-                                <input type="text" id="txtIdSerialNumber" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                            <li>
-                                <label for="txtIdDeviceDescription">${LabelDeviceDescription}</label>
-                                <input type="text" id="txtIdDeviceDescription" data-mini="true" />
-                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                            </li>
-                        </ul>
-
-                        <h2>
-                            <span style="vertical-align:middle;">${HeaderHttpHeaders}</span>
-                            <button class="btnAddIdentificationHttpHeader" data-icon="plus" data-iconpos="notext" data-inline="true" type="button" style="vertical-align:middle;margin-left:.25em;">${ButtonAdd}</button>
-                        </h2>
-                        <div class="httpHeaderIdentificationList"></div>
-                    </div>
 
                     <div class="tabContent tabDirectPlayProfiles">
                         <p>${HeaderDirectPlayProfileHelp}</p>
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index a95d0db840..5bbb7169ec 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -118,13 +118,16 @@
                 url: linkUrl,
                 data: {
                     ConnectUsername: enteredConnectUsername
-                }
+                },
+                dataType: 'json'
 
-            }).done(function () {
+            }).done(function (result) {
+
+                var msgKey = result.IsPending ? 'MessagePendingMediaBrowserAccountAdded' : 'MessageMediaBrowserAccountAdded';
 
                 Dashboard.alert({
 
-                    message: Globalize.translate('MessageMediaBrowserAccontAdded'),
+                    message: Globalize.translate(msgKey),
                     title: Globalize.translate('HeaderMediaBrowserAccountAdded'),
 
                     callback: function () {