You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/10 17:58:29 UTC
svn commit: r1311805 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/
openmeetings/public/themes/basic-theme/general/
src/base/components/calendar/ src/base/components/calendar/resources/
Author: sebawagner
Date: Tue Apr 10 15:58:29 2012
New Revision: 1311805
URL: http://svn.apache.org/viewvc?rev=1311805&view=rev
Log:
OPENMEETINGS-129 Fix calendar field icon
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/calendar_view_week.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/resources/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateField.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=1311805&r1=1311804&r2=1311805&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:58:29 2012
@@ -72,6 +72,11 @@
license="APL Author sebawagner"
src="public/themes/basic-theme/general/add.png" />
+ <resource name="date_icon_rsc"
+ description="Edit Add Icon"
+ license="FamFam Icon Set"
+ src="public/themes/basic-theme/general/calendar_view_week.png" />
+
<!-- Sorted list -->
<resource name="step_back_two_arrow"
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/calendar_view_week.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/calendar_view_week.png?rev=1311805&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/calendar_view_week.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateField.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateField.lzx?rev=1311805&r1=1311804&r2=1311805&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateField.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateField.lzx Tue Apr 10 15:58:29 2012
@@ -20,8 +20,6 @@
-->
<library>
-<resource name="date_icon_rsc" src="resources/date.png" />
-
<class name="dateField" extends="view" width="104">
<attribute name="enabled" value="true" type="boolean" />
@@ -62,19 +60,20 @@
<attribute name="text" value="" type="string" />
- <customEdittext name="_text" width="$once{ parent.width-20 }" regexpType="date"
+ <customEdittext name="_text" width="$once{ parent.width-22 }" regexpType="date"
align="left" text="${ parent.text }" enabled="${ parent.enabled }" />
- <view resource="date_icon_rsc" align="right"
+ <blueButton resourceItem="date_icon_rsc" align="right"
opacity="${ ((parent.enabled) ? 1 : 0.4) }"
- onmouseover="" onmouseout="" y="4">
+ x_insetResource="2" y_insetResource="2" width="20" height="20"
+ width_insetResource="16" height_insetResource="16">
<handler name="onclick">
if (parent.enabled) {
new lz.calendarWindow(this.parent.parent,{fieldRef:this.parent._text,x:this.parent.x+(this.parent.width-200),y:this.parent.y});
}
</handler>
<labelTooltip labelid="162" />
- </view>
+ </blueButton>
</class>