Author: sebawagner
Date: Wed Apr 11 12:59:41 2012
New Revision: 1324745
URL: http://svn.apache.org/viewvc?rev=1324745&view=rev
Log:
OPENMEETINGS-129 Fix DashBoard icons and tabButtonMain icons to APL license
compatible, replace when necessary / possible with other icons
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/folder_explore.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/group.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/comments.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/conference_icon_normal.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/feed.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_1.fla
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_1.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_1.png
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_1.png
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_2.fla
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_2.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_2.png
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_2.png
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_3.fla
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_3.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_3.png
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_3.png
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_4.fla
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_4.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/wizzard_button_4.png
- copied unchanged from r1310714,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/wizzard_button_4.png
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/folder_yellow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/kdmconfig.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/resources/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.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=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Wed Apr 11 12:59:41 2012
@@ -236,4 +236,52 @@
license="FamFam Icon Set"
src="public/themes/basic-theme/whiteboard/lock_open.png" />
+ <!-- Dashboard -->
+
+ <resource name="icon_btn_dashboard_1"
+ description="Info Guide Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/dashboard/wizzard_button_1.png" />
+
+ <resource name="icon_btn_dashboard_2"
+ description="Info Guide Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/dashboard/wizzard_button_2.png" />
+
+ <resource name="icon_btn_dashboard_3"
+ description="Info Guide Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/dashboard/wizzard_button_3.png" />
+
+ <resource name="icon_btn_dashboard_4"
+ description="Info Guide Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/dashboard/wizzard_button_4.png" />
+
+ <resource name="icon_btn_rss_conference"
+ description="RSS Tab Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/dashboard/feed.png" />
+
+ <resource name="icon_btn_chat_dashboard"
+ description="Chat Tab Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/dashboard/comments.png" />
+
+ <resource name="icon_btn_rooms_conference"
+ description="Conference Room Tab Icon"
+ license="APL author sebawagner"
+
src="public/themes/basic-theme/dashboard/conference_icon_normal.png" />
+
+ <!-- Conference room -->
+ <resource name="users_tab_btn"
+ description="Conference Room Tab User"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/conference/group.png" />
+
+ <resource name="files_tab_btn"
+ description="Conference Room Tab Files"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/conference/folder_explore.png" />
+
</theme>
\ No newline at end of file
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/folder_explore.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/folder_explore.png?rev=1324745&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/folder_explore.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/group.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/group.png?rev=1324745&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/group.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/comments.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/comments.png?rev=1324745&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/comments.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/conference_icon_normal.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/conference_icon_normal.png?rev=1324745&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/conference_icon_normal.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/feed.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/feed.png?rev=1324745&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/dashboard/feed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
Wed Apr 11 12:59:41 2012
@@ -36,7 +36,6 @@
<handler name="oninit">
canvas.thishib.setDefaultUserLanguage();
-
_mainScrollBar.setAttribute("visibility","hidden");
lz.Focus.setFocus(this.username,true);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
Wed Apr 11 12:59:41 2012
@@ -26,8 +26,6 @@
<frame src="resources/bullet_ball_glass_red.png"/> <!--
whiteboard allow -->
</resource>
- <resource name="users_tab_btn" src="resources/kdmconfig.png" />
- <resource name="files_tab_btn" src="resources/folder_yellow.png" />
<resource name="chat_message_incoming_rsc"
src="resources/ledlightgreen.png" />
<resource name="screen_allow_rsc" src="resources/background_small.png"
/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx?rev=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
Wed Apr 11 12:59:41 2012
@@ -32,7 +32,7 @@
]]>
</handler>
- <view resource="$once{ parent.resourceViewName }" />
+ <image src="$once{ canvas.getThemeImage( parent.resourceViewName ) }" />
<labelText name="_txt" labelid="$once{ parent.labelid }" x="0"
y="64" fontstyle="bold" fgcolor="0x14537C" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx?rev=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
Wed Apr 11 12:59:41 2012
@@ -20,16 +20,6 @@
-->
<library>
-
- <resource name="icon_btn_dashboard_1"
src="resources/wizzard_button_1.png" />
- <resource name="icon_btn_dashboard_2" src="resources/wizzard_button_2.png"
/>
- <resource name="icon_btn_dashboard_3" src="resources/wizzard_button_3.png"
/>
- <resource name="icon_btn_dashboard_4" src="resources/wizzard_button_4.png"
/>
-
- <resource name="icon_btn_chat_dashboard"
src="resources/internet-group-chat2.png" />
- <resource name="icon_btn_rooms_conference"
src="resources/network-transmit-receive2.png" />
- <resource name="icon_btn_rss_conference" src="resources/rss_small.png" />
-
<include href="tabButtonMain.lzx" />
<include href="infosPanel.lzx" />
<include href="profilesPanel.lzx" />
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=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Wed Apr 11 12:59:41 2012
@@ -194,12 +194,12 @@
</handler>
<tabButtonMain name="myRoomsTabButton" height="$once{
parent.height }"
- currentIconRsc="icon_btn_rooms_conference" labelid="1305"
width="${ (parent.width-4)/3 }" />
+ currentIconRsc="icon_btn_rooms_conference" labelid="1305"
width="${ (parent.width-8)/3 }" />
- <tabButtonMain name="chatTabButton" width="${ (parent.width-4)/3
}" height="$once{ parent.height }"
+ <tabButtonMain name="chatTabButton" width="${ (parent.width-8)/3
}" height="$once{ parent.height }"
currentIconRsc="icon_btn_chat_dashboard" labelid="443" />
- <tabButtonMain name="rssFeed1TabButton" width="${
(parent.width-4)/3 }" height="$once{ parent.height }"
+ <tabButtonMain name="rssFeed1TabButton" width="${
(parent.width-8)/3 }" height="$once{ parent.height }"
currentIconRsc="icon_btn_rss_conference" labelid="277" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx?rev=1324745&r1=1324744&r2=1324745&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
Wed Apr 11 12:59:41 2012
@@ -104,7 +104,7 @@
<view name="_bg2" bgcolor="0xFFFFFF" width="$once{ parent.width-2 }" y="3"
x="1"
height="$once{ parent.height-4 }" opacity="1" visibility="hidden"/>
- <view x="6" y="6" name="_icon" resource="$once{ parent.currentIconRsc }"
+ <image x="6" y="6" name="_icon" src="$once{ canvas.getThemeImage(
parent.currentIconRsc ) }"
width="20" height="20" stretches="both"
visible="$once{ parent.showIcon }" />
<labelText name="_text" x="$once{ (parent.showIcon) ? 28 : 6 }"
fontsize="$once{ parent.textFontSize }"
