From 5301d4189fde3332237b52ce26ab08f5c7fb0baa Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Mar 2010 12:18:24 +0200
Subject: Updated major sub task EXT-5858 - Assigned picture is stretched in
 the Classified Info panel. Fixed reshape issues. Added stretching to edit
 classified panel.

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/panel_classified_info.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 869a05f27d..65c154daee 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -74,15 +74,25 @@
      height="500"
      left="0"
      width="285">
+        <panel
+         name="snapshot_panel"
+         layout="topleft"
+         follows="left|top|right"
+         height="197"
+         left="10"
+         top="10"
+         width="275"
+        >
         <texture_picker
          enabled="false"
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="10"
+         left="0"
          name="classified_snapshot"
-         top="10"
+         top="0"
          width="275" />
+        </panel>
         <text_editor
          allow_scroll="false"
          bg_visible="false"
-- 
cgit v1.2.3


From 929129482d798db3eaf1e0bbf6a9f49444e85e72 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Mar 2010 12:19:54 +0200
Subject: Updated major sub task EXT-5857 - location, content type, category,
 description in the Classified Info panel have no labels. Updating padding
 because texture and name field are too close(introduced in
 10127:4b36b7d75399)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classified_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 65c154daee..cee78d7d5c 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -104,7 +104,7 @@
          font="SansSerifBig"
          font.style="BOLD"
          left="10"
-         top_pad="0"
+         top_pad="5"
          name="classified_name"
          read_only="true"
          text_color="white"
-- 
cgit v1.2.3


From c4987fde9fa0d3e0df6098517b5b245bc848e4eb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 4 Mar 2010 10:52:44 +0000
Subject: More PE merge (revert some of these to trunk versions - PE shouldn't
 be changing the translated files I reckon)

---
 .../skins/default/xui/en/panel_classified_info.xml | 100 ++++++++++++++++++++-
 1 file changed, 96 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 cb1df4249e..a8c72e03bd 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -93,6 +93,17 @@
          v_pad="0"
          value="[name]"
          use_ellipses="true" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="classified_location_label"
+         text_color="white"
+         top_pad="10"
+         value="Location:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -103,10 +114,22 @@
          left="10"
          name="classified_location"
          read_only="true"
+         top_pad="5"
          width="290"
          word_wrap="true"
          v_pad="0"
          value="[loading...]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="content_type_label"
+         text_color="white"
+         top_pad="10"
+         value="Content Type:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -121,6 +144,17 @@
          top_pad="15"
          v_pad="0"
          value="[content type]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="category_label"
+         text_color="white"
+         top_pad="10"
+         value="Category:"
+         width="250" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -136,6 +170,17 @@
          top_pad="5"
          v_pad="0"
          value="[category]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="price_for_listing_label"
+         text_color="white"
+         top_pad="10"
+         value="Price for listing:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -150,17 +195,61 @@
          top_pad="5"
          tool_tip="Price for listing."
          v_pad="0"
+         value="[price]"
          width="105" />
+        <layout_stack
+         animate="false"
+         name="descr_stack"
+         layout="topleft"
+         follows="top|left"
+         orientation="vertical"
+         left="10"
+         top_pad="5"
+         width="290"
+         height="250">
+         <layout_panel
+          auto_resize="false"
+          name="price_layout_panel"
+          layout="topleft"
+          follows="top|left"
+          left="0"
+          top="0"
+          width="290"
+          height="26"
+          user_resize="false">
         <check_box
          enabled="false"
          height="16"
          label="Auto renew each week"
          layout="topleft"
-         left="10"
+         follows="top|left"
+         left="0"
          name="auto_renew"
-         top_pad="5"
+         top="0"
          v_pad="0"
          width="290" />
+         </layout_panel>
+         <layout_panel
+          name="descr_layout_panel"
+          layout="topleft"
+          follows="top|left"
+          left="0"
+          top="0"
+          width="290"
+          height="215"
+          user_resize="false">
+        <text
+         auto_resize="false"
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="classified_desc_label"
+         text_color="white"
+         top="0"
+         value="Description:"
+         width="250" />
         <text_editor
          allow_html="true"
          allow_scroll="true"
@@ -168,15 +257,18 @@
          follows="left|top|right"
          h_pad="0"
          height="200"
-         width="272"
          layout="topleft"
-         left="10"
+         left="0"
          max_length="1023"
          name="classified_desc"
          read_only="true"
+         top_pad="5"
+         width="290"
          v_pad="0"
          value="[description]"
          word_wrap="true" />
+         </layout_panel>
+        </layout_stack>
     </panel>
     </scroll_container>
     <panel
-- 
cgit v1.2.3


From d94826a5e6d7429dbbfddaa25aad1c4d977c2e26 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Mar 2010 17:53:08 +0200
Subject: merge

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_classified_info.xml | 39 +++++++++++++---------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 30546d32a1..932e34d694 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -21,6 +21,14 @@
  <panel.string
   name="l$_price">
     L$[PRICE]
+ </panel.string>
+ <panel.string
+  name="click_through_text_fmt">
+    [TELEPORT] teleport, [MAP] map, [MAP] profile
+ </panel.string>
+ <panel.string
+  name="date_fmt">
+    [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
  </panel.string>
     <button
      follows="top|right"
@@ -79,7 +87,6 @@
          enabled="false"
          follows="left|top|right"
          height="197"
-         width="272"
          layout="topleft"
          left="0"
          name="classified_snapshot"
@@ -97,7 +104,7 @@
          font="SansSerifBig"
          font.style="BOLD"
          left="10"
-         top_pad="5"
+         top_pad="10"
          name="classified_name"
          read_only="true"
          text_color="white"
@@ -112,7 +119,7 @@
          left="10"
          name="classified_location_label"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Location:"
          width="250" />
         <text_editor
@@ -140,7 +147,7 @@
          text_color="white"
          top_pad="10"
          value="Content Type:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -148,11 +155,11 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="content_type"
          read_only="true"
-         width="290"
-         top_pad="15"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[content type]" />
         <text
@@ -163,9 +170,9 @@
          left="10"
          name="category_label"
          text_color="white"
-         top_pad="10"
+         top_pad="0"
          value="Category:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -174,11 +181,11 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="category"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[category]" />
         <text
@@ -216,9 +223,9 @@
          left="10"
          name="price_for_listing_label"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Price for listing:"
-         width="250" />
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -227,10 +234,10 @@
          halign="left"
          height="16"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="price_for_listing"
          read_only="true"
-         top_pad="5"
+         top_pad="-10"
          tool_tip="Price for listing."
          v_pad="0"
          value="[price]"
-- 
cgit v1.2.3


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: 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
---
 .../skins/default/xui/en/panel_classified_info.xml | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 932e34d694..bd06a607f7 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"
-- 
cgit v1.2.3


From 17c66d71b163046ac9c507bcc42d3e7f7644707a Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 5 Mar 2010 10:15:57 +0200
Subject: Merged recent PE classified panel changes with LL fixes for EXT-5824,
 EXT-5860 and EXT-5859.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_classified_info.xml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_classified_info.xml')

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 bd06a607f7..1535ce2978 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -135,7 +135,7 @@
          bg_visible="false"
          follows="left|top"
          h_pad="0"
-         height="25"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
@@ -254,17 +254,17 @@
          animate="false"
          name="descr_stack"
          layout="topleft"
-         follows="top|left"
+         follows="all"
          orientation="vertical"
          left="10"
          top_pad="5"
          width="290"
-         height="250">
+         height="215">
          <layout_panel
           auto_resize="false"
           name="clickthrough_layout_panel"
           layout="topleft"
-          follows="top|left"
+          follows="all"
           left="0"
           top="0"
           width="290"
@@ -302,7 +302,7 @@
           auto_resize="false"
           name="price_layout_panel"
           layout="topleft"
-          follows="top|left"
+          follows="all"
           left="0"
           top="0"
           width="290"
@@ -332,7 +332,7 @@
          <layout_panel
           name="descr_layout_panel"
           layout="topleft"
-          follows="top|left"
+          follows="all"
           left="0"
           top="0"
           width="290"
@@ -354,7 +354,7 @@
          allow_html="true"
          allow_scroll="true"
          bg_visible="false"
-         follows="left|top|right"
+         follows="all"
          h_pad="0"
          height="200"
          layout="topleft"
@@ -362,8 +362,8 @@
          max_length="1023"
          name="classified_desc"
          read_only="true"
-         top_pad="5"
-         width="290"
+         top_pad="7"
+         width="280"
          v_pad="0"
          value="[description]"
          word_wrap="true" />
-- 
cgit v1.2.3