From eb037986bdc25488fef25763b84025be25bc9e23 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 5 Mar 2010 09:30:40 +0200
Subject: [PATCH] Update for normal sub task EXT-5856 - "Auto renew each week"
checkbox is displayed in the Classified Info from other resident profile.
Replaced auto_renew checkbox with textbox.
--HG--
branch : product-engine
---
indra/newview/llpanelclassified.cpp | 5 ++-
.../default/xui/en/panel_classified_info.xml | 35 ++++++++++++++-----
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index d59a7d752e4..5138ca7c36e 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1299,7 +1299,10 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
bool mature = is_cf_mature(c_info->flags);
childSetValue("content_type", mature ? mature_str : pg_str);
- childSetValue("auto_renew", is_cf_auto_renew(c_info->flags));
+
+ std::string auto_renew_str = is_cf_auto_renew(c_info->flags) ?
+ getString("auto_renew_on") : getString("auto_renew_off");
+ childSetValue("auto_renew", auto_renew_str);
price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing));
childSetValue("price_for_listing", LLSD(price_str));
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 932e34d6949..bd06a607f7a 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -29,6 +29,14 @@
<panel.string
name="date_fmt">
[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string
+ name="auto_renew_on">
+ Enabled
+ </panel.string>
+ <panel.string
+ name="auto_renew_off">
+ Disabled
</panel.string>
<button
follows="top|right"
@@ -260,7 +268,7 @@
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
<text
follows="left|top"
@@ -298,19 +306,28 @@
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
- <check_box
- enabled="false"
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="10"
+ layout="topleft"
+ left="0"
+ name="auto_renew_label"
+ text_color="white"
+ top="0"
+ value="Auto renew:"
+ width="140" />
+ <text
height="16"
- label="Auto renew each week"
layout="topleft"
follows="top|left"
- left="0"
+ left_pad="0"
name="auto_renew"
- top="0"
- v_pad="0"
- width="290" />
+ top_pad="-10"
+ value="Enabled"
+ width="150" />
</layout_panel>
<layout_panel
name="descr_layout_panel"
--
GitLab