Author: sebawagner
Date: Thu Apr 12 17:48:03 2012
New Revision: 1325408
URL: http://svn.apache.org/viewvc?rev=1325408&view=rev
Log:
OPENMEETINGS-129 Fix default profile image, info icon
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/information.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/resources/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_big_profile_pic.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_chat_profile_pic.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_profile_profile_pic.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/profile_pic.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/library.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=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Thu Apr 12 17:48:03 2012
@@ -44,6 +44,11 @@
description="Toolbar Icon"
license="FamFam Icon Set"
src="public/themes/basic-theme/general/error.png" />
+
+ <resource name="info_text_icon_rsc"
+ description="Info Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/information.png" />
<!-- Save Toolbar (for example Admin section) -->
@@ -288,5 +293,5 @@
description="Conference Room Tab Icon"
license="APL author sebawagner"
src="public/themes/basic-theme/conference/exit_button.png" />
-
+
</theme>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_big_profile_pic.jpg
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_big_profile_pic.jpg?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_chat_profile_pic.jpg
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_chat_profile_pic.jpg?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_profile_profile_pic.jpg
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_profile_profile_pic.jpg?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/profile_pic.jpg
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/profile_pic.jpg?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
Binary files - no diff available.
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/information.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/information.png?rev=1325408&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/information.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Thu Apr 12 17:48:03 2012
@@ -276,7 +276,7 @@
</view>
</view>
- <view x="500" resource="info_text_icon_rsc" y="4" />
+ <image x="510" src="$once{
canvas.getThemeImage('info_text_icon_rsc') }" y="6" />
<labelText labelid="782" x="530" width="${ parent.width-540 }"
y="4" multiline="true" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/library.lzx?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/library.lzx
Thu Apr 12 17:48:03 2012
@@ -20,19 +20,30 @@
-->
<library>
+ <!-- APL Author sebawagner -->
<resource name="calendar_one_day_hours_index_bg_rsc"
src="resources/one_day_hours.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_day_hours_index_bg_rsc"
src="resources/day_hours_index_only.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_day_bg_rsc" src="resources/day_hours.png" />
+ <!-- FamFam Icon Set -->
<resource name="calendar_add_user_rsc" src="resources/user_add.png" />
+ <!-- FamFam Icon Set -->
<resource name="calendar_add_user_external_rsc"
src="resources/user_go.png" />
+ <!-- FamFam Icon Set -->
<resource name="calendar_delete_button" src="resources/delete.png" />
+ <!-- APL Author sebawagner -->
<resource name="single_event_popup_background_rsc"
src="resources/single_event_popup_background.swf" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_resultset_next_rsc"
src="resources/resultset_next.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_resultset_previous_rsc"
src="resources/resultset_previous.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_contact_calendar_rsc"
src="resources/calendar.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_revert_to_own_undo_rsc"
src="resources/arrow_undo.png" />
+ <!-- APL Author sebawagner -->
<resource name="calendar_change_event_height_rsc"
src="resources/height_change_cursor.swf" />
-
<include href="layouts/" />
<include href="addAttendee.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
Thu Apr 12 17:48:03 2012
@@ -101,7 +101,7 @@
<view name="_conferences" height="${ parent.height-40 }" y="40">
<view name="PublicMeetings" height="${ parent.height }">
- <view x="4" resource="info_text_icon_rsc" />
+ <image x="10" src="$once{
canvas.getThemeImage('info_text_icon_rsc') }" />
<labelText labelid="778" x="30" width="400"
multiline="true" />
@@ -177,7 +177,7 @@
<!-- private Meetings -->
<view name="PrivateMeetings" visibility="hidden" height="${
parent.height }">
- <view x="4" resource="info_text_icon_rsc" />
+ <image x="10" src="$once{
canvas.getThemeImage('info_text_icon_rsc') }" />
<labelText labelid="780" x="30" width="400"
multiline="true" />
@@ -239,7 +239,7 @@
<!-- Appointed Meetings -->
<view name="MyMeetings" visibility="hidden" height="${
parent.height }">
- <view x="4" resource="info_text_icon_rsc" />
+ <image x="10" src="$once{
canvas.getThemeImage('info_text_icon_rsc') }" />
<labelText labelid="782" x="30" width="400"
multiline="true" />
@@ -249,15 +249,13 @@
<handler name="oninit">
canvas.thishib.roomtype = "public";
- new lz.roomListItem(this.inn.inn.inn,
- {
+ new lz.roomListItem(this.inn.inn.inn,{
roomType:1,
ispublic:true,
roomname :
canvas.getLabelName(1306)
});
- new lz.roomListItem(this.inn.inn.inn,
- {
+ new lz.roomListItem(this.inn.inn.inn,{
roomType:3,
ispublic:true,
roomname :
canvas.getLabelName(1307)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/library.lzx?rev=1325408&r1=1325407&r2=1325408&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/library.lzx
Thu Apr 12 17:48:03 2012
@@ -20,8 +20,6 @@
-->
<library>
- <resource name="info_text_icon_rsc" src="resources/messagebox_info.png"
/>
-
<include href="allmeetings.lzx" />
</library>
