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/29 11:14:14 UTC
svn commit: r1331885 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: languages/
src/modules/conference/tabcontent/chat/
src/modules/conference/tabcontent/chat/resources/
src/modules/conference/tabcontent/fileexplorer/ src/modules/conference...
Author: sebawagner
Date: Sun Apr 29 09:14:13 2012
New Revision: 1331885
URL: http://svn.apache.org/viewvc?rev=1331885&view=rev
Log:
OPENMEETINGS-129 Fix UI Icons to APL compliance
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/resources/connect.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/tick.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/user.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/information.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/cursor.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/apply.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/user-male-green.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/messagebox_info.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/users.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/doc/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/doc/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/menupointer.png
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mic.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/resources/trash.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Sun Apr 29 09:14:13 2012
@@ -5516,7 +5516,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1373" name="login_screen">
- <value>besuchen</value>
+ <value>besuche</value>
</string>
<string id="1374" name="login_screen">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Sun Apr 29 09:14:13 2012
@@ -3518,7 +3518,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="873" name="flvrecording">
- <value>Download the FLV-File</value>
+ <value>Download as FLV</value>
</string>
<string id="874" name="flvrecording">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx Sun Apr 29 09:14:13 2012
@@ -23,6 +23,7 @@
<resource name="delete_chat_log_rsc" src="resources/cancel.png" />
<resource name="copy_chat_log_rsc" src="resources/edit-copy.png" />
<resource name="smile_chat_log_rsc" src="resources/smile.swf" />
+ <resource name="start_conference2_rsc" src="resources/connect.png" />
<include href="simpleBaseTabpane.lzx" />
<include href="showChatLog.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/resources/connect.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/resources/connect.png?rev=1331885&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/resources/connect.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/library.lzx Sun Apr 29 09:14:13 2012
@@ -56,7 +56,10 @@
<resource name="file_explorer_add_folder_rsc" src="resources/folder_add.png" />
<!-- FamFam Icon Set -->
<resource name="file_explorer_reload_rsc" src="resources/arrow_refresh_small.png" />
- <!-- APL Author sebawagner -->
+ <!--
+ WPZOOM Creative Commons Attribution-ShareAlike 3.0 Unported License.
+ http://www.wpzoom.com/wpzoom/new-freebie-wpzoom-developer-icon-set-154-free-icons/
+ -->
<resource name="file_explorer_trash_rsc" src="resources/trash.png" />
<!-- APL Author sebawagner -->
<resource name="file_explorer_close_rsc" src="resources/remove_item.png" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/resources/trash.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/resources/trash.png?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx Sun Apr 29 09:14:13 2012
@@ -20,8 +20,6 @@
-->
<library>
- <resource name="start_conference2_rsc" src="resources/users_small.png" />
-
<include href="testSetup.lzx" />
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx Sun Apr 29 09:14:13 2012
@@ -405,7 +405,8 @@
]]>
</method>
- <text name="_title" x="2" datapath="title" text="$path{ 'text()' }" />
+ <text name="_title" x="2" datapath="title" text="$path{ 'text()' }" clip="true"
+ width="${ parent.width-2 }" multiline="true" height="${ parent.height }"/>
<view width="20" height="4" valign="bottom" align="center" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx Sun Apr 29 09:14:13 2012
@@ -200,7 +200,8 @@
this.setAttribute("text",parseTimeStringFromXmlString(d.childNodes[0].data));
</handler>
</text>
- <text name="_title" x="36" datapath="title" text="$path{ 'text()' }" />
+ <text name="_title" x="36" datapath="title" text="$path{ 'text()' }" clip="true"
+ width="${ parent.width-36 }" height="${ parent.height }"/>
</view>
<simplelayout axis="y" spacing="1" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx Sun Apr 29 09:14:13 2012
@@ -129,7 +129,7 @@
fileName:fileExplorerItem.fileName,
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
- fileIcon:'file_explorer_image_rsc',
+ fileIcon:'file_explorer_video_rsc',
refObjListRoot:this
});
}
@@ -167,7 +167,7 @@
fileName:fileExplorerItem.fileName,
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
- fileIcon:'file_explorer_image_rsc',
+ fileIcon:'file_explorer_video_rsc',
refObjListRoot:this
});
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx Sun Apr 29 09:14:13 2012
@@ -330,7 +330,7 @@
fileName:fileExplorerItem.fileName,
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
- fileIcon:'file_explorer_image_rsc',
+ fileIcon:'file_explorer_video_rsc',
refObjListRoot:this.refObjListRoot
});
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx Sun Apr 29 09:14:13 2012
@@ -20,10 +20,11 @@
-->
<library>
-<resource name="user_moderator_list_apply_rsc" src="apply.png" />
+<!-- FamFam Icon Set -->
+<resource name="user_moderator_list_apply_rsc" src="tick.png" />
<!-- add for calendar -->
-
-<resource name="user_profile_rsc" src="user-male-green.png" />
+<!-- FamFam Icon Set -->
+<resource name="user_profile_rsc" src="user.png" />
</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/tick.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/tick.png?rev=1331885&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/tick.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/user.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/user.png?rev=1331885&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/user.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx Sun Apr 29 09:14:13 2012
@@ -19,13 +19,17 @@
-->
<library>
-
+
+ <!-- APL author sebawagner -->
<resource name="level_meter_rsc" src="resources/level_meter.png" />
-
+ <!-- APL author sebawagner -->
<resource name="test_setup_record_rsc" src="resources/record.png" />
+ <!-- APL author sebawagner -->
<resource name="test_setup_play_rsc" src="resources/run.png" />
+ <!-- APL author sebawagner -->
<resource name="test_setup_stop_rsc" src="resources/stop.png" />
- <resource name="test_setup_info_rsc" src="resources/messagebox_info.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="test_setup_info_rsc" src="resources/information.png" />
<include href="testingApplication.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/information.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/information.png?rev=1331885&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/information.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx Sun Apr 29 09:14:13 2012
@@ -401,7 +401,7 @@ Test the setup values before you enter a
<view name="_over" width="238" height="18" x="1" y="1" bgcolor="0xFFFFFF" />
</view>
- <view y="294" resource="test_setup_info_rsc" x="10" />
+ <view y="292" resource="test_setup_info_rsc" x="16" />
<labelText fontstyle="bold" labelid="765" x="39" y="290"
width="$once{ parent.width-50 }" multiline="true" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx Sun Apr 29 09:14:13 2012
@@ -1,32 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+<!-- APL author sebawagner -->
<resource src="explorerbar.png" name="explorer_thumb_rsc" />
+<!-- APL author sebawagner -->
<resource name="explorer_button_min_rsc" >
<frame src="explorbar_minimize_no.png" />
<frame src="explorbar_minimize_mo.png" />
<frame src="explorbar_minimize_dn.png" />
</resource>
+<!-- APL author sebawagner -->
<resource name="explorer_button_max_rsc" >
<frame src="explorbar_maximize_no.png" />
<frame src="explorbar_maximize_mo.png" />
<frame src="explorbar_maximize_dn.png" />
</resource>
+<!-- APL author sebawagner -->
<resource name="explorer_resize_rsc" src="resizer.swf" />
+<!-- APL author sebawagner -->
<resource name="btn_presenter_minimize" src="minimize_up.png" />
+<!-- APL author sebawagner -->
<resource name="btn_presenter_maximize" src="maximize_up.png" />
+<!-- APL author sebawagner -->
<resource name="btn_presenter_maximize2" src="maximize2_up.png" />
+<!-- APL author sebawagner -->
<resource name="btn_presenter_close">
<frame src="close_up.png" />
<frame src="close_mo.png" />
<frame src="close_dn.png" />
</resource>
+<!-- APL author sebawagner -->
<resource name="explorer_resizemouse_rsc" src="resizemouse.png" />
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx Sun Apr 29 09:14:13 2012
@@ -20,6 +20,7 @@
-->
<library>
+ <!-- APL author sebawagner -->
<resource name="arrow_down_slider_rsc" src="resources/arrow_down_slider.png" />
<include href="basePropertySelector.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx?rev=1331885&r1=1331884&r2=1331885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx Sun Apr 29 09:14:13 2012
@@ -20,7 +20,8 @@
-->
<library>
- <resource name="menupointer_rsc" src="resources/menupointer.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="menupointer_rsc" src="resources/cursor.png" />
<include href="screenSharingDialog.lzx" />
<include href="videoObjectPlayScreenShare.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/cursor.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/cursor.png?rev=1331885&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/cursor.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream