Author: sebawagner
Date: Tue Apr 10 15:07:01 2012
New Revision: 1311776
URL: http://svn.apache.org/viewvc?rev=1311776&view=rev
Log:
OPENMEETINGS-129 Fix result-set icons in table component
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_down.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_first.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_last.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_next.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_previous.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_up.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/1downarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/1leftarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/1rightarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/1uparrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/2leftarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/2rightarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/step_back.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/step_fwd.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverTextItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgUsersRecordValueList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessagItem.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Tue Apr 10 15:07:01 2012
@@ -71,7 +71,39 @@
description="Edit Add Icon"
license="APL Author sebawagner"
src="public/themes/basic-theme/general/add.png"
/>
-
+
+ <!-- Sorted list -->
+
+ <resource name="step_back_two_arrow"
+ description="Step to first"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_first.png" />
+
+ <resource name="step_fwd_two_arrow"
+ description="Step to last"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_last.png" />
+
+ <resource name="step_back_arrow"
+ description="Step one back"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_previous.png" />
+
+ <resource name="step_fwd_arrow"
+ description="Step one next"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_next.png" />
+
+ <resource name="sort_up_rsc"
+ description="Sort up"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_up.png" />
+
+ <resource name="sort_down_rsc"
+ description="Sort down"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/resultset_down.png" />
+
<!-- Whiteboard Toolbar -->
<resource name="plain"
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_down.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_down.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_down.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_first.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_first.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_first.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_last.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_last.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_last.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_next.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_next.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_next.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_previous.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_previous.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_previous.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_up.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_up.png?rev=1311776&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/resultset_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
Tue Apr 10 15:07:01 2012
@@ -27,14 +27,15 @@
<turnOverTextItem text="$once{ parent.valueName }" width="226" />
- <view width="60"
+ <view width="60" height="24"
onclick="new
lz.confirmDeleteWindow(canvas.main_content._content.inner,{refObj:this});" >
<method name="confirmDelete">
this.parent.parent.parent.parent.parent.itemToDelete=this;
this.parent.parent.parent.parent.parent.deleteItem.sendEvent(parent);
</method>
- <image src="$once{ canvas.getThemeImage('button_cancel_rsc') }"
- align="center" valign="middle" />
+ <image stretches="both" width="16" height="16"
+ src="$once{ canvas.getThemeImage('button_cancel_rsc')
}"
+ align="center" y="4" />
<labelTooltip labelid="274" />
</view>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
Tue Apr 10 15:07:01 2012
@@ -20,15 +20,15 @@
-->
<library>
- <resource name="step_back_two_arrow" src="resources/2leftarrow.png" />
- <resource name="step_fwd_two_arrow" src="resources/2rightarrow.png" />
-
- <resource name="step_back_arrow" src="resources/1leftarrow.png" />
- <resource name="step_fwd_arrow" src="resources/1rightarrow.png" />
-
- <resource name="sort_up_rsc" src="resources/1uparrow.png" />
- <resource name="sort_down_rsc" src="resources/1downarrow.png" />
+ <!-- APL Author sebawagner -->
+ <resource name="width_gripper_rsc" src="resources/width_gripper.png" />
+ <!-- APL Author sebawagner -->
+ <resource name="sort_asc_turnover_rsc" src="resources/sort_asc.png" />
+
+ <!-- APL Author sebawagner -->
+ <resource name="sort_desc_turnover_rsc" src="resources/sort_desc.png" />
+
<include href="turnOverList.lzx" />
<include href="simpleTurnOverList.lzx" />
<include href="turnOverListHeaderItem.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
Tue Apr 10 15:07:01 2012
@@ -194,22 +194,24 @@
<labelText name="_records" x="2" resize="true" />
<!-- 368:goto first -->
- <miniIcons name="_pre1" y="2" x="$once{ parent.width-188 }"
resource="step_back_two_arrow" width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_pre1" y="0" x="$once{ parent.width-188 }"
resourceItem="step_back_two_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16" >
<handler name="onclick">
parent.callfirst();
</handler>
<labelTooltip labelid="368" />
- </miniIcons>
+ </blueButton>
<!-- 369:goto previous -->
- <miniIcons name="_pre2" y="2" x="$once{ parent.width-166 }"
resource="step_back_arrow" width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_pre2" y="0" x="$once{ parent.width-166 }"
resourceItem="step_back_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.callpre();
</handler>
<labelTooltip labelid="369" />
- </miniIcons>
+ </blueButton>
<!-- combobox to decide the step number -->
<resetCombobox name="languages" width="96" x="$once{ parent.width-144 }"
@@ -233,22 +235,24 @@
</resetCombobox>
<!-- 370:goto next -->
- <miniIcons name="_next1" y="2" x="$once{ parent.width-44 }"
resource="step_fwd_arrow" width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_next1" y="0" x="$once{ parent.width-44 }"
resourceItem="step_fwd_arrow"
+ x_insetResource="2" y_insetResource="2" width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.callnext();
</handler>
<labelTooltip labelid="370" />
- </miniIcons>
+ </blueButton>
<!-- 371:goto last -->
- <miniIcons name="_next2" y="2" x="$once{ parent.width-21 }"
resource="step_fwd_two_arrow" width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_next2" y="0" x="$once{ parent.width-21 }"
resourceItem="step_fwd_two_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.calllast();
</handler>
<labelTooltip labelid="371" />
- </miniIcons>
+ </blueButton>
<!-- ========= BgArea area =========-->
<view width="$once{ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
Tue Apr 10 15:07:01 2012
@@ -20,11 +20,6 @@
-->
<library>
-<resource name="width_gripper_rsc" src="resources/width_gripper.swf" />
-
-<resource name="sort_asc_turnover_rsc" src="resources/sort_asc.png" />
-<resource name="sort_desc_turnover_rsc" src="resources/sort_desc.png" />
-
<class name="turnOverListHeaderItem" extends="simpleLabelButton" clip="true"
fontstyle="plain">
<attribute name="subviewsid" value="0" type="number" />
@@ -167,10 +162,10 @@
parent.parent.parent.updateOrder(this);
</handler>
- <view name="_sortUp" visibility="hidden" stretches="both" width="8"
height="8" y="6"
- x="${parent.width - 13 }" resource="sort_up_rsc" />
- <view name="_sortDown" visibility="hidden" stretches="both" width="8"
height="8" y="6"
- x="${parent.width - 13 }" resource="sort_down_rsc" />
+ <image name="_sortUp" visibility="hidden" stretches="both" width="8"
height="8" y="6"
+ x="${parent.width - 13 }" src="$once{
canvas.getThemeImage('sort_up_rsc') }" />
+ <image name="_sortDown" visibility="hidden" stretches="both" width="8"
height="8" y="6"
+ x="${parent.width - 13 }" src="$once{
canvas.getThemeImage('sort_down_rsc') }" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverTextItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverTextItem.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverTextItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverTextItem.lzx
Tue Apr 10 15:07:01 2012
@@ -22,7 +22,7 @@
<class name="turnOverTextItem" extends="text" fontsize="11" resize="false">
<view height="$once{ parent.parent.height }" width="1"
- align="right" bgcolor="black" />
+ align="right" bgcolor="$once{
canvas.getThemeColor('secondBorderColor') }" />
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
Tue Apr 10 15:07:01 2012
@@ -472,22 +472,24 @@
visibility="$once{ (parent.showTopBar) ? 'visible' : 'hidden' }">
<!-- 368:goto first -->
- <miniIcons name="_pre1" y="2" x="0" resource="step_back_two_arrow"
width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_pre1" y="0" x="0"
resourceItem="step_back_two_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.parent.callfirst();
</handler>
<labelTooltip labelid="368" />
- </miniIcons>
+ </blueButton>
<!-- 369:goto previous -->
- <miniIcons name="_pre2" y="2" x="20" resource="step_back_arrow"
width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_pre2" y="0" x="20"
resourceItem="step_back_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.parent.callpre();
</handler>
<labelTooltip labelid="369" />
- </miniIcons>
+ </blueButton>
<resetCombobox name="_step" width="100" x="40" editable="false"
fontsize="10" height="20" >
<attribute name="sendEventToReload" value="false" type="boolean" />
<textlistitem value="10" text="10" />
@@ -514,22 +516,24 @@
</resetCombobox>
<!-- 370:goto next -->
- <miniIcons name="_next1" y="2" x="140" resource="step_fwd_arrow"
width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_next1" y="0" x="140" resourceItem="step_fwd_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.parent.callnext();
</handler>
<labelTooltip labelid="370" />
- </miniIcons>
+ </blueButton>
<!-- 371:goto last -->
- <miniIcons name="_next2" y="2" x="160"
resource="step_fwd_two_arrow" width="16" height="16"
- showhandcursor="true">
+ <blueButton name="_next2" y="0" x="160"
resourceItem="step_fwd_two_arrow"
+ x_insetResource="2" y_insetResource="2"
width="20" height="20"
+ width_insetResource="16"
height_insetResource="16">
<handler name="onclick">
parent.parent.calllast();
</handler>
<labelTooltip labelid="371" />
- </miniIcons>
+ </blueButton>
<view width="2" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1311776&r1=1311775&r2=1311776&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
Tue Apr 10 15:07:01 2012
@@ -88,9 +88,8 @@
</turnOverList>
<text name="_header" fontstyle="bold" text="Sessionvars" x="790" y="2"/>
- <!-- -->
<view name="_roomvalueform" x="790" y="20" clip="true"
- height="${ canvas.height - 130 }" width="${ canvas.width -
790 }">
+ height="${ canvas.height - canvas.naviHeight - 20 }"
width="${ canvas.width - 790 }">
<method name="initValueFieldsByObject" args="value">
<
