diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-22 13:58:00 +0200 | 
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-22 13:58:00 +0200 | 
| commit | 6f98e0b9721515065b84d32428b0e55a4bde89d3 (patch) | |
| tree | 3e5f613d4ed88cfc1d991b88658f5ba646a17e6f /indra/newview | |
| parent | a8e9f7ab5010bd4f9d80fbd0002a16bcb802716c (diff) | |
fix for EXT-5128 Groups accordions should all appear on-screen w/out scrolling (open accordion should fill space)
fix is not complete since we got horizontal scrolbar which I think is not intended...need to fix croll_container.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
5 files changed, 112 insertions, 67 deletions
| diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 41e53be29e..f913c58cc9 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,9 +1,8 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel   label="General" - follows="all"   height="604" - width="303" + width="304"   class="panel_group_general"   name="general_tab">      <panel.string @@ -26,7 +25,7 @@ Hover your mouse over the options for more help.        top="0"        left="0"        height="129" -      width="313" +      width="304"        layout="topleft">      <texture_picker       follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index b196d8eeb7..4e57b428bd 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -81,80 +81,129 @@ background_visible="true"       width="292"       border_size="0">     <layout_panel -         bg_alpha_color="DkGray2" -         bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" -      name="group_accordions" -      follows="all" -      layout="topleft" -      auto_resize="true" -      > +       bg_alpha_color="DkGray2" +       bg_opaque_color="DkGray2" +       background_visible="true" +       background_opaque="true" +       name="group_accordions" +       follows="all" +       layout="topleft" +       auto_resize="true">     <accordion       left="0"       top="0" -           single_expansion="true" -             follows="all" -             layout="topleft" -             name="groups_accordion"> -             <accordion_tab +     single_expansion="true" +     follows="all" +     layout="topleft" +     name="groups_accordion"> +         <accordion_tab              expanded="true"              layout="topleft"              name="group_general_tab"              title="General"> -            <panel -             border="false" -             class="panel_group_general" -             filename="panel_group_general.xml" -             layout="topleft" -             left="0" -             follows="all" -             help_topic="group_general_tab" -             name="group_general_tab_panel" -             top="0" /> +               <scroll_container +                 color="DkGray2" +                 follows="all" +                 layout="topleft" +                 left="0" +                 name="profile_scroll" +                 opaque="true" +                 height="604" +                 width="304" +                 top="0"> +                   <panel +                      border="false" +                      class="panel_group_general" +                      filename="panel_group_general.xml" +                      layout="topleft" +                      left="0" +                      follows="left|top|right" +                      help_topic="group_general_tab" +                      name="group_general_tab_panel" +                      top="0" /> +			   </scroll_container>           </accordion_tab>           <accordion_tab              expanded="false"              layout="topleft"              name="group_roles_tab"              title="Roles"> -            <panel -            border="false" -            class="panel_group_roles" -             filename="panel_group_roles.xml" -             layout="topleft" -             left="0" -             name="group_roles_tab_panel" -             top="0" /> +               <scroll_container +                 color="DkGray2" +                 follows="all" +                 layout="topleft" +                 left="0" +                 name="profile_scroll" +                 opaque="true" +                 height="680" +                 width="304" +                 top="0"> + +                <panel +                   border="false" +                   class="panel_group_roles" +                   filename="panel_group_roles.xml" +                   follows="left|top|right" +                   layout="topleft" +                   left="0" +                   name="group_roles_tab_panel" +                   top="0" /> +                </scroll_container>           </accordion_tab>           <accordion_tab -                 expanded="false" +            expanded="false" +            layout="topleft" +            name="group_notices_tab" +            title="Notices"> +               <scroll_container +                 color="DkGray2" +                 follows="all"                   layout="topleft" -                 name="group_notices_tab" -                 title="Notices"> -        <panel -        border="false" -         class="panel_group_notices" -         filename="panel_group_notices.xml" -         layout="topleft" -         left="0" -         help_topic="group_notices_tab" -         name="group_notices_tab_panel" -         top="0" /> +                 left="0" +                 name="profile_scroll" +                 opaque="true" +                 height="530" +                 width="304" +                 top="0"> + +                <panel +                    border="false" +                    class="panel_group_notices" +                    filename="panel_group_notices.xml" +                    follows="left|top|right" +                    layout="topleft" +                    left="0" +                    help_topic="group_notices_tab" +                    name="group_notices_tab_panel" +                    top="0" /> +               </scroll_container>           </accordion_tab> -        <accordion_tab -                 expanded="false" +         <accordion_tab +             expanded="false" +             layout="topleft" +             name="group_land_tab" +             title="Land/Assets"> +               <scroll_container +                 color="DkGray2" +                 follows="all"                   layout="topleft" -                 name="group_land_tab" -                 title="Land/Assets"> -        <panel -        border="false" -         class="panel_group_land_money" -         filename="panel_group_land_money.xml" -         layout="topleft" -         left="0" -         name="group_land_tab_panel" -         top="0" /> +                 left="0" +                 name="profile_scroll" +                 opaque="true" +                 height="500" +                 width="304" +                 top="0"> + +                 <panel +					 border="false" +                     class="panel_group_land_money" +                     filename="panel_group_land_money.xml" +                     follows="left|top|right" +                     layout="topleft" +                     left="0" +                     name="group_land_tab_panel" +                     top="0" /> +               </scroll_container>           </accordion_tab>           </accordion>     </layout_panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 38b0f234d5..7996a89e72 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -1,14 +1,13 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel   border="false" - follows="all"   height="500"   label="Land & L$"   layout="topleft"   left="0"   name="land_money_tab"   top="0" - width="313"> + width="304">      <panel.string       name="help_text">     A warning appears until the Total Land in Use is less than or = to the Total Contribution. diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 5f46ad7860..731b3c119c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -1,13 +1,12 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel - follows="all"   height="530"   label="Notices"   layout="topleft"   left="0"   name="notices_tab"   top="0" - width="313"> + width="304">      <panel.string       name="help_text">          Notices let you send a message and an optionally attached item. @@ -44,7 +43,7 @@ Maximum 200 per group daily       right="-1"       name="notice_list"       top_pad="0" -     width="313"> +     width="304">          <scroll_list.columns           label=""           name="icon" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 7557e2cc5e..19c0da4f08 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,13 +1,12 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>  <panel - follows="all"   height="680"   label="Members & Roles"   layout="topleft"   left="0"   top="0"   name="roles_tab" - width="313"> + width="304">      <panel.string       name="default_needs_apply_text">          There are unsaved changes @@ -31,7 +30,7 @@       tab_height="22"       tab_min_width="90"       top="0" -     width="313"> +     width="304">          <panel           border="false"           follows="all" | 
