From b147d659dc0c94a972f1c82f16536b374ee10c19 Mon Sep 17 00:00:00 2001
From: pavelk_productengine <pavelkproductengine@lindenlab.com>
Date: Tue, 17 Mar 2015 18:26:28 +0200
Subject: MAINT-4734 (Separate transaction notices from group notice/invites) 
 1) stripped off attachment field;  2) made logos (group's, sender's, etc) in
 expanded view the same size as in condensed view;  3) turned on notification
 showing upon click;  4) fixed cropped right border of Invite and Transactions
 notifications;  5) enabled "Collapse All" button;  6) stripped off
 unnecessary icons.

---
 .../default/textures/icons/Icon_Group_Large.png    | Bin 12280 -> 0 bytes
 .../default/textures/icons/Icon_Group_Small.png    | Bin 4473 -> 0 bytes
 .../textures/icons/Incoming_Transaction_Large.png  | Bin 4939 -> 0 bytes
 .../textures/icons/Incoming_Transaction_Small.png  | Bin 1666 -> 0 bytes
 .../textures/icons/Outcoming_Transaction_Large.png | Bin 4662 -> 0 bytes
 .../textures/icons/Outcoming_Transaction_Small.png | Bin 1322 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml  |  16 ++-----
 .../xui/en/floater_notifications_tabbed.xml        |  50 ++-------------------
 .../skins/default/xui/en/floater_sys_well.xml      |   4 --
 .../skins/default/xui/en/language_settings.xml     |   2 +-
 indra/newview/skins/default/xui/en/menu_login.xml  |   2 +-
 .../xui/en/panel_notification_list_item.xml        |  37 ++++++---------
 12 files changed, 21 insertions(+), 90 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Large.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Small.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Large.png b/indra/newview/skins/default/textures/icons/Icon_Group_Large.png
deleted file mode 100644
index 6dc0cbda0b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Icon_Group_Large.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Small.png b/indra/newview/skins/default/textures/icons/Icon_Group_Small.png
deleted file mode 100644
index ef2b521a1f..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Icon_Group_Small.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png
deleted file mode 100644
index e73dfe2695..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png
deleted file mode 100644
index 8b39770c63..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png
deleted file mode 100644
index 79011edd8b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png
deleted file mode 100644
index 96c6150f3b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index eef7d56e75..e47e0c03f1 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -795,17 +795,7 @@ with the same filename but different name
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 
-  <texture name="Notification_Condense" file_name="icons/Icon_Notification_Condense.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Notification_Expand" file_name="icons/Icon_Notification_Expand.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Icon_Group_Small" file_name="icons/Icon_Group_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Icon_Group_Large" file_name="icons/Icon_Group_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="System_Notification_Small" file_name="icons/System_Notification_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="System_Notification_Large" file_name="icons/System_Notification_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Incoming_Transaction_Small" file_name="icons/Incoming_Transaction_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Incoming_Transaction_Large" file_name="icons/Incoming_Transaction_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Outcoming_Transaction_Small" file_name="icons/Outcoming_Transaction_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-  <texture name="Outcoming_Transaction_Large" file_name="icons/Outcoming_Transaction_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
-
+  <texture name="Notification_Condense" file_name="icons/Icon_Notification_Condense.png" preload="true"/>
+  <texture name="Notification_Expand" file_name="icons/Icon_Notification_Expand.png" preload="true"/>
+  <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index 6162bc99b2..55ecfb637b 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -81,7 +81,7 @@
           left="0"
           top="5"
           height="0"
-          width="330"/>
+          width="328"/>
       </panel>
       <panel
        border="true"
@@ -98,13 +98,13 @@
           left="0"
           top="5"
           height="0"
-          width="330"/>
+          width="328"/>
       </panel>
     </tab_container>
     
     <layout_stack width="336" height="26" enabled="true" orientation="horizontal"  follows="left|right" name="ButtonsStack">
       <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="CondenseAllButtonPanel">
-        <button width="93" height="21" left="2" label="Collapse all" name="CondenseAllButton">
+        <button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
         </button>
       </layout_panel>
       <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="GapLayoutPanel">
@@ -118,48 +118,4 @@
     </layout_stack>
   </layout_panel>
   </layout_stack>
-  </floater>
-
-<!--
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- bevel_style="in"
- layout="topleft"
- name="notifications_tabbed_window"
- help_topic="notification_chiclet"
- save_rect="true"
- title="NOTIFICATIONS"
- width="320"
- min_width="320"
- height="23"
- can_minimize="false"
- can_tear_off="false"
- can_resize="true"
- can_drag_on_left="false"
- can_dock="true"
- save_dock_state="true"
- save_visibility="true"
- single_instance="true"
->
-  <string
-   name="title_im_well_window">
-    CONVERSATIONS
-  </string>
-  <string
-   name="title_notification_well_window">
-    NOTIFICATIONS1
-  </string>
-
-  <flat_list_view
-    color="FloaterDefaultBackgroundColor"
-    follows="all"
-    layout="topleft"
-    name="notification_list"
-    left="1"
-    top="20"
-    height="0"
-    width="318"/>
 </floater>
--->
-
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index ecedb27438..2c5176cf01 100755
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -23,10 +23,6 @@
      name="title_im_well_window">
         CONVERSATIONS
     </string>
-    <string
-     name="title_notification_well_window">
-        NOTIFICATIONS
-    </string>
 
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index 3ad0f04469..51779e4bfd 100755
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -50,7 +50,7 @@
 	<string name="LTimeSec">second,datetime,local</string>
 	<string name="LTimeHour">hour,datetime,local</string>
 	<string name="LTimeMin">min,datetime,local</string>	
-	<string name="LTimeYear">year,datetime,local</string>
+	<string name="LTimeYear">year,datetime,local</string>	
 	
 	<string name="UTCTimeWeek">weekday,datetime,utc</string>
 	<string name="UTCTimeDay">day,datetime,utc</string>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 0d9612990d..e91eea04d1 100755
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -303,7 +303,7 @@
       <menu_item_call
         label="Show Notifications Console"
         name="Show Notifications Console"
-        visible="true"
+        visible="false"
         shortcut="control|shift|5">
         <on_click
          function="Floater.Toggle"
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index 05b721000f..55456723a2 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -39,23 +39,21 @@
       <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
       <layout_panel width="30" height="39" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_right">
         <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
-        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification_Small" visible="false"/>
-        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="incoming_transaction_icon" tool_tip="Icon" image_name="Incoming_Transaction_Small" visible="false"/>
-        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="outcoming_transaction_icon" tool_tip="Icon" image_name="Outcoming_Transaction_Small" visible="false"/>
+        <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
+        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification" visible="false"/>
       </layout_panel>
       <layout_panel width="260" height="50" orientation="horizontal" name="layout_panel_middle">
         <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right" layout="topleft" name="main_info_panel">
           <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="notification_title_panel">
-            <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="245" height="12" layout="topleft" follows="right|left" text_color="White"
+            <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="260" height="12" layout="topleft" follows="right|left" text_color="White"
               use_ellipses="true" word_wrap="true" mouse_opaque="false" name="notification_title" >
               Group Name:Notice Title N o t i c e T i t l e N o t i c e T i t l e N o t i c e T i t l e N oticeTitle
             </text>
-            <icon top="0" left="242" width="21" height="21" image_name="Icon_Attachment_Small" follows="right" mouse_opaque="true" name="icon_attachment_small" tool_tip="Attachment"/>
           </panel>
           <panel border="false" top="23" left="0" width="260" height="15" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="sender_time_panel">
-            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="250" height="13" layout="topleft" follows="right|left"
-              use_ellipses="true" word_wrap="true" mouse_opaque="false" name="sender_resident" visible="false">
-              Sender:Resident
+            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="170" height="13" layout="topleft" follows="right|left"
+              use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_resident" visible="false">
+              Sender: "Resident R e s i d e n t R e s i d e n t"
             </text>
             <text allow_scroll="false" font="SansSerifSmall" top="0" right="-5" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
               name="notification_time" value="2014/12/24 23:30" />
@@ -76,19 +74,17 @@
   <layout_panel top="0" left="0" height="196" follows="left|top|right|bottom" layout="topleft" name="layout_panel_expanded_view" visible="true">
    <panel border="true" top="0" left="5" height="193" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="panel_expanded_view">
       <layout_stack top="0" left="0" width="325" height="193" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
-      <layout_panel width="60" height="170" orientation="horizontal" follows="left|top|bottom" name="layout_panel_right_exp">
-        <group_icon left="5" top="6" width="55" height="55" mouse_opaque="true" name="group_icon_exp" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
-        <icon left="5" top="6" width="55" height="55" mouse_opaque="true" name="system_notification_icon_exp" tool_tip="Icon" image_name="System_Notification_Large" visible="false"/>
-        <icon left="5" top="6" width="55" height="55" mouse_opaque="true" name="incoming_transaction_icon_exp" tool_tip="Icon" image_name="Incoming_Transaction_Large" visible="false"/>
-        <icon left="5" top="6" width="55" height="55" mouse_opaque="true" name="outcoming_transaction_icon_exp" tool_tip="Icon" image_name="Outcoming_Transaction_Large" visible="false"/>
-        <icon top="142" right="65" width="22" height="25" image_name="Icon_Attachment_Large" follows="right" mouse_opaque="true" name="icon_attachment_large" tool_tip="Attachment"/>
+      <layout_panel width="30" height="170" orientation="horizontal" follows="left|top|bottom" name="layout_panel_right_exp">
+        <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon_exp" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
+        <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon_exp" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
+        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon_exp" tool_tip="Icon" image_name="System_Notification" visible="false"/>
       </layout_panel>
       <layout_panel width="230" height="170" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_middle_exp">
         <panel border="false" top="0" width="230" height="38" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel_expanded">
           <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp">
             <text allow_scroll="false" font="SansSerif" top="6" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
               use_ellipses="true" word_wrap="false" mouse_opaque="false" name="notification_title_exp">
-              Notice Title Notice Title N o t i c e T i t l e
+              Notice Title Notice Title N o t i c e T i t l e N o t i c e T i t l e
             </text>
             <text allow_scroll="false" font="SansSerif" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
               use_ellipses="true" word_wrap="false" mouse_opaque="false" name="group_name_exp" visible="false">
@@ -96,27 +92,20 @@
             </text>
           </panel>
           <panel border="false" left="0" width="230" height="12" bevel_style="none" follows="left|top|right" layout="topleft" name="sender_time_panel_exp">
-            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="143" height="13" layout="topleft" follows="right|left"
+            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="145" height="13" layout="topleft" follows="right|left"
               use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_resident_exp" visible="false">
               Sender: "Resident R e s i d e n t R e s i d e n t"
             </text>
             <text allow_scroll="false" font="SansSerifSmall" top="0" right="-1" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
               name="notification_time_exp" value="2014/12/24 23:30" />
           </panel>
-          <panel border="true" left="1" width="230" height="90" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="full_notice_text_panel_exp" visible="true"
+          <panel border="true" left="1" width="230" height="115" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="full_notice_text_panel_exp" visible="true"
                    bg_visible="true">
             <text allow_scroll="false" font="SansSerifSmall" top="4" left="5" width="220" height="80" layout="topleft" follows="left|top|right|bottom"
               use_ellipses="true" word_wrap="true" mouse_opaque="false" max_length="400" name="notification_text_exp" >
               Notice text goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla .
             </text>
           </panel>
-          <panel border="true" left="1" width="230" height="21" bevel_style="none" follows="left|bottom|right" layout="topleft" name="full_notice_attach_panel_exp" visible="true"
-                   bg_visible="true">
-            <text allow_scroll="false" font="SansSerifSmall" top="4" left="5" width="220" height="12" layout="topleft" follows="left|top|right|bottom"
-              use_ellipses="true" word_wrap="true" mouse_opaque="false" max_length="96" name="notification_full_text">
-              Attachment goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla .
-            </text>
-          </panel>
         </panel>
       </layout_panel>
       <layout_panel width="18" orientation="horizontal" follows="right|top|bottom" name="layout_panel_left_exp">
-- 
cgit v1.2.3