Author: sebawagner
Date: Tue May 1 08:10:13 2012
New Revision: 1332561
URL: http://svn.apache.org/viewvc?rev=1332561&view=rev
Log:
OPENMEETINGS-248 Add some default icons under Creative Commons 3.0 License from
thenounproject.com
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/ambulance.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/bow.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/community.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/help.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/home.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/idea.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/refresh.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/swim.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/ambulance.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/bow.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/community.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/help.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/home.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/idea.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/refresh.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/swim.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/resources/all_general_images.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/resources/all_images.jpg
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/ambulance.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/ambulance.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/ambulance.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/bow.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/bow.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/bow.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/community.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/community.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/community.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/help.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/help.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/help.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/home.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/home.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/home.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/idea.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/idea.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/idea.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/refresh.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/refresh.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/refresh.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/swim.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/swim.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/swim.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/ambulance.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/ambulance.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/ambulance.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/bow.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/bow.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/bow.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/community.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/community.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/community.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/help.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/help.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/help.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/home.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/home.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/home.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/idea.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/idea.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/idea.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/refresh.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/refresh.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/refresh.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/swim.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/swim.png?rev=1332561&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/cliparts/thumb/swim.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx?rev=1332561&r1=1332560&r2=1332561&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
Tue May 1 08:10:13 2012
@@ -57,7 +57,7 @@
<attribute name="clipArtEndx" value="0" type="number" />
<attribute name="clipArtEndy" value="0" type="number" />
- <attribute name="currentClipArtRessourceName" value="icons.png"
type="string"/>
+ <attribute name="currentClipArtRessourceName" value="idea.png"
type="string"/>
<method name="startDrawClipArt" args="oid_name">
<![CDATA[
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/library.lzx?rev=1332561&r1=1332560&r2=1332561&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/library.lzx
Tue May 1 08:10:13 2012
@@ -20,16 +20,16 @@
-->
<library>
+ <!-- APL author sebawagner -->
<resource name="sub_menu_tools_panel_rsc" src="resources/sub_menu.png" />
+ <!-- APL author sebawagner -->
<resource name="sub_menu_top_grip_colored_rsc"
src="resources/sub_menu_top_grip.swf" />
<!--
How to create image map:
$imageMagick/montage *.png -tile 20x -geometry 22x22+2+2 all_images.jpg
-->
- <resource name="sub_menu_icons_math_all_rsc"
src="resources/all_images.jpg" />
- <resource name="sub_menu_icons_general_all_rsc"
src="resources/all_general_images.jpg" />
-
+
<include href="mainToolsPanelItem.lzx" />
<include href="mainToolsPanel.lzx" />
<include href="subMenuIconToolsToUpload.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx?rev=1332561&r1=1332560&r2=1332561&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
Tue May 1 08:10:13 2012
@@ -76,8 +76,8 @@
<![CDATA[
if ($debug) Debug.write("Show Sub Menu");
new lz.subMenuIconToolsToUpload(canvas,{
- x:400,
- y:52,
+ x:500,
+ y:82,
refToolbar:parent
});
]]>
@@ -140,8 +140,8 @@
<handler name="onclick">
if ($debug) Debug.write("Show Sub Menu");
new lz.subMenuIconToolsToUpload(canvas,{
- x:400,
- y:52,
+ x:500,
+ y:82,
refToolbar:parent
});
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1332561&r1=1332560&r2=1332561&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Tue May 1 08:10:13 2012
@@ -25,11 +25,11 @@
<attribute name="modi" value="" type="string"/>
<handler name="onclick">
- parent.sendNewIcon(this);
+ parent.sendNewIcon(this,"");
</handler>
<handler name="ondblclick">
- parent.sendNewIcon(this);
+ parent.sendNewIcon(this,"");
parent.chooseSelect();
</handler>
@@ -215,7 +215,7 @@
<class name="subMenuIconToolsToUpload" extends="guiPresenter" labelid="1335"
minimizable="false" maximizable="false" fullToolBar="true"
- resizeable="false" width="540" height="480" >
+ resizeable="false" width="340" height="280" >
<attribute name="currentSelected" value="null" />
<attribute name="refToolbar" value="null" />
@@ -259,7 +259,7 @@
}
var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
-
+'public/cliparts/'+folderName+'thumb/'+refObj.modi;
+ +'public/cliparts/thumb/'+refObj.modi;
if ($debug) Debug.write("this.refToolbar :: ",this.refToolbar);
@@ -311,64 +311,16 @@
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
//if ($debug) Debug.write("##############
getClipArtIcons : ",value);
-
- for (var subCategoryId in value.subCategories) {
- //if ($debug) Debug.write("subCategory :
",subCategoryId);
- if
(value.subCategories[subCategoryId].folderName == "math") {
-
//parent.loadIconMainTheme(value.subCategories[subCategoryId].folderName,
- //
value.subCategories[subCategoryId].folderName);
-
//parent.loadIconThumbs(value.subCategories[subCategoryId].generalList,
- //
value.subCategories[subCategoryId].folderName);
-
parent.loadMathIconThumbs(value.subCategories[subCategoryId].folderName,
-
value.subCategories[subCategoryId].generalList);
- }
- }
-
- parent.loadGeneralIconThumbs(value.generalList);
+ parent.loadIconThumbs(value.generalList,"");
]]>
</handler>
</netRemoteCallHib>
- <method name="loadIconMainTheme" args="fName,folderName">
- <![CDATA[
-
- this.currentContainer = new
lz.miniIconSmybolExtraIconsContainer(this,{
-
fName:fName,
-
folderName:folderName
-
});
-
- ]]>
- </method>
-
- <method name="loadMathIconThumbs" args="folderName,iconList">
- this.currentContainer = new
lz.miniIconSmybolExtraIconsContainer(this,{
-
fName:canvas.getLabelName(1368),
- folderName:folderName,
- iconList:iconList,
- isopen:false
- });
- new
lz.miniIconSmybolExtraIconsImageMap(this.currentContainer._content,{
-
resource:'sub_menu_icons_math_all_rsc'});
- </method>
-
- <method name="loadGeneralIconThumbs" args="iconList">
- this.currentContainer = new
lz.miniIconSmybolExtraIconsContainer(this,{
-
fName:canvas.getLabelName(1369),
- folderName:"",
- iconList:iconList
- });
- new
lz.miniIconSmybolExtraIconsImageMap(this.currentContainer._content,{
-
resource:'sub_menu_icons_general_all_rsc'});
- </method>
-
<method name="loadIconThumbs" args="list,folderName">
<![CDATA[
- if (folderName != "") {
- folderName += "/";
- }
var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
-
+'public/cliparts/'+folderName+'thumb/';
+ +'public/cliparts/thumb/';
//if ($debug) Debug.write("imageurl :: ",imageurl);
@@ -380,9 +332,10 @@
var iconresourceName = imageurl + list[i];
- new
lz.miniIconSmybolExtraIcons(this.currentContainer._content,{
+ new lz.miniIconSmybolExtraIcons(this,{
modi:list[i],
- resource:iconresourceName
+ resource:iconresourceName,
+ stretches:'both'
});
}
@@ -391,9 +344,8 @@
]]>
</method>
-
- <simplelayout axis="y" spacing="2" inset="2" />
+ <wrappinglayout axis="y" spacing="2" inset="2" />
</view>
<om_vscrollbar />
