Author: sebawagner Date: Sun Dec 30 01:20:36 2012 New Revision: 1426876 URL: http://svn.apache.org/viewvc?rev=1426876&view=rev Log: OPENMEETINGS-228 committing changes from Artyom Horuzhenko
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/color_swatch.png (with props) incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/style.png (with props) incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_bold.png (with props) incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_italic.png (with props) incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_underline.png (with props) incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/world_link.png (with props) Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/fontOptions.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/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=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml Sun Dec 30 01:20:36 2012 @@ -137,6 +137,38 @@ description="Sort down" license="FamFam Icon Set" src="public/themes/basic-theme/general/resultset_down.png" /> + + <!-- Chat toolbar --> + + <resource name="font_style" + description="Change font style button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/style.png" /> + + <resource name="font_bold" + description="Bold font style button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/text_bold.png" /> + + <resource name="font_italic" + description="Italic font style button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/text_italic.png" /> + + <resource name="font_underline" + description="Underline font style button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/text_underline.png" /> + + <resource name="font_color" + description="Change font color button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/color_swatch.png" /> + + <resource name="hyperlink" + description="Insert hyperlink button" + license="FamFam Icon Set" + src="public/themes/basic-theme/general/world_link.png" /> <!-- Whiteboard Toolbar --> Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/color_swatch.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/color_swatch.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/color_swatch.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/style.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/style.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/style.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_bold.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_bold.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_bold.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_italic.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_italic.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_italic.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_underline.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_underline.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/text_underline.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/world_link.png URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/world_link.png?rev=1426876&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/world_link.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx Sun Dec 30 01:20:36 2012 @@ -74,10 +74,10 @@ </handler> </netRemoteCallHib> - <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="$once{ parent.width-2 }" + <view bgcolor="0xFFFFFF" width="$once{ parent.width-2 }" opacity="0.8" height="$once{ parent.height-2 }" x="1" y="1" /> - <labelText x="1" y="1" labelid="446" /><!-- 446:Emoticons --> + <labelText x="1" y="1" labelid="446" fontstyle="bold" /><!-- 446:Emoticons --> <view name="inn" width="158" height="118" x="0" y="20" clip="true"> <view name="inn" width="$once{ parent.height }" > <wrappinglayout axis="x" spacing="2" /> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/fontOptions.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/fontOptions.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/fontOptions.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/fontOptions.lzx Sun Dec 30 01:20:36 2012 @@ -46,10 +46,22 @@ ]]> </method> - <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="$once{ parent.width-2 }" + <method name="applyStyle" args="styleLeftPart, styleRightPart"> + var messageBox = btnRef.message; + var beforeSelection = messageBox.getText().substring(0, messageBox._ctext.selPosition); + var selection = messageBox.getText().substring(messageBox._ctext.selPosition, + messageBox._ctext.selPosition + messageBox._ctext.selSize); + var afterSelection = messageBox.getText().substring(messageBox._ctext.selPosition + + messageBox._ctext.selSize, messageBox.getText().length); + messageBox.setText(beforeSelection + styleLeftPart + selection + styleRightPart + afterSelection); + close(); + lz.Focus.setFocus(messageBox._ctext); + </method> + + <view bgcolor="0xFFFFFF" width="$once{ parent.width-2 }" opacity="0.8" height="$once{ parent.height-2 }" x="1" y="1" /> - <labelText x="1" y="1" labelid="1530" /><!-- 1530:Font style --> + <labelText x="1" y="1" labelid="1530" fontstyle="bold" /><!-- 1530:Font style --> <view name="_close" x="$once{ parent.width-this.width-2 }" y="2" resource="btn_presenter_close" @@ -64,136 +76,79 @@ <labelTooltip labelid="430" /><!-- 430:close --> </view> - <miniIcons y="18" x="0" resource="font_bold" - width="24" height="24" showhandcursor="true"> + <miniIconsImage y="18" x="0" src="$once{ canvas.getThemeImage('font_bold') }" + width="24" height="24" showhandcursor="true" stretches="none" xoffset="-4" yoffset="-4"> <handler name="onclick"> <![CDATA[ parent.applyStyle("<b>", "</b>"); ]]> </handler> <labelTooltip labelid="87" /> - </miniIcons> + </miniIconsImage> - <miniIcons y="18" x="24" resource="font_italic" - width="24" height="24" showhandcursor="true"> + <miniIconsImage y="18" x="24" src="$once{ canvas.getThemeImage('font_italic') }" + width="24" height="24" showhandcursor="true" stretches="none" xoffset="-4" yoffset="-4"> <handler name="onclick"> <![CDATA[ parent.applyStyle("<i>", "</i>"); ]]> </handler> <labelTooltip labelid="86" /> - </miniIcons> + </miniIconsImage> - <miniIcons y="18" x="48" resource="font_underline" - width="24" height="24" showhandcursor="true"> + <miniIconsImage y="18" x="48" src="$once{ canvas.getThemeImage('font_underline') }" + width="24" height="24" showhandcursor="true" stretches="none" xoffset="-4" yoffset="-4"> <handler name="onclick"> <![CDATA[ parent.applyStyle("<u>", "</u>"); ]]> </handler> <labelTooltip labelid="1529" /> - </miniIcons> + </miniIconsImage> - <miniIcons y="18" x="72" resource="font_color" - width="24" height="24" showhandcursor="true"> + <miniIconsImage y="18" x="72" src="$once{ canvas.getThemeImage('font_color') }" + width="24" height="24" showhandcursor="true" stretches="none" xoffset="-4" yoffset="-4"> + <attribute name="selectedColor" type="number" value="0" /> + <attribute name="colorBeforeOpen" type="number" /> + <attribute name="colorPickRef" value="null"/> <handler name="onclick"> <![CDATA[ - var pick = new lz.colorPanel(canvas,{ - fontPanel:parent, - x:(this.getAttributeRelative('x',canvas)-130), - y:(this.getAttributeRelative('y',canvas)-116) - }); - lz.ModeManager.makeModal(pick); + this.colorPickRef = new lz.colorpicker(canvas,{btnRef:this, + x:(this.getAttributeRelative('x',canvas)-(250-this.width)), + y:(this.getAttributeRelative('y',canvas)-154+this.height)}); + var myColor = new Color(); + myColor.setRGB(0); + this.colorPickRef.doDefaultColor(myColor); + this.colorBeforeOpen = colorPickRef.selectedColor; + lz.ModeManager.makeModal(this.colorPickRef); ]]> </handler> + + <method name="closedColorPicker"> + // called by colorpicker + </method> + + <method name="setTransformedStringColor"> + <![CDATA[ + if (colorBeforeOpen != this.colorPickRef.selectedColor) + parent.applyStyle("<font color=\'#" + + parseInt(this.colorPickRef.selectedColor).toString(16) + "\'>", "</font>"); + ]]> + </method> + <labelTooltip labelid="1532" /> - </miniIcons> + </miniIconsImage> - <miniIcons y="18" x="96" resource="insert_hyperlink" - width="24" height="24" showhandcursor="true"> + <miniIconsImage y="18" x="96" src="$once{ canvas.getThemeImage('hyperlink') }" + width="24" height="24" showhandcursor="true" stretches="none" xoffset="-4" yoffset="-4"> <handler name="onclick"> <![CDATA[ parent.applyStyle("<a href=\"\">", "</a>"); ]]> </handler> <labelTooltip labelid="1533" /> - </miniIcons> + </miniIconsImage> - <method name="applyStyle" args="styleLeftPart, styleRightPart"> - var messageBox = btnRef.message; - var beforeSelection = messageBox.getText().substring(0, messageBox._ctext.selPosition); - var selection = messageBox.getText().substring(messageBox._ctext.selPosition, - messageBox._ctext.selPosition + messageBox._ctext.selSize); - var afterSelection = messageBox.getText().substring(messageBox._ctext.selPosition + - messageBox._ctext.selSize, messageBox._ctext.length); - messageBox.setText(beforeSelection + styleLeftPart + selection + styleRightPart + afterSelection); - close(); - </method> - -</class> - -<class name="colorPanel" extends="closableView" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" - clickable="true" width="130" height="116"> - <attribute name="fontPanel"/> - <method name="passModeEvent" args="eventStr,view" > - <![CDATA[ - if ( eventStr == "onmousedown" ){ - if ( view != null ) { - if ( !view.childOf(this) ) { - this.close(); - } - } else { - this.close(); - } - } - if (view && view.childOf(this)) { - if (view[ eventStr ]) { - view[ eventStr ].sendEvent( view ); - } - return false; - } - return true; - ]]> - </method> - - <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="$once{ parent.width-2 }" - height="$once{ parent.height-2 }" x="1" y="1" /> - - <labelText x="1" y="1" labelid="1532" /><!-- 1532:Font color --> - - <view name="_close" x="$once{ parent.width-this.width-2 }" y="2" - resource="btn_presenter_close" - onmouseover="this.setAttribute('frame',2)" - onmouseout="this.setAttribute('frame',1)" - onmousedown="this.setAttribute('frame',3)" - onmouseup="this.setAttribute('frame',1)" > - <handler name="onclick"> - this.setAttribute('frame',2); - this.parent.close(); - </handler> - <labelTooltip labelid="430" /><!-- 430:close --> - </view> - - <colorbutton bgcolor="red" x="0" y="20" /> - <colorbutton bgcolor="green" x="32" y="20" /> - <colorbutton bgcolor="blue" x="64" y="20" /> - <colorbutton bgcolor="yellow" x="96" y="20" /> - <colorbutton bgcolor="magenta" x="0" y="52" /> - <colorbutton bgcolor="pink" x="32" y="52" /> - <colorbutton bgcolor="orange" x="64" y="52" /> - <colorbutton bgcolor="purple" x="96" y="52" /> - <colorbutton bgcolor="cyan" x="0" y="84" /> - -</class> - -<class name="colorbutton" extends="miniIcons" width="32" height="32"> - <handler name="onclick"> - <![CDATA[ - var color = "#" + this.bgcolor.toString(16); - parent.fontPanel.applyStyle("<font color=\'" + color + "\'>", "</font>"); - parent.close(); - ]]> - </handler> </class> -</library> +</library> \ No newline at end of file Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx Sun Dec 30 01:20:36 2012 @@ -86,7 +86,9 @@ //if($debug) Debug.write("overAllChatOutput/messageObj: ",messageObj); var usercolor = value[5]; - if ( usercolor==null || usercolor==0 || usercolor.length==0 )usercolor=0xCCCCCC; + if($debug) Debug.write("overAllChatOutput/usercolor: ",usercolor); + + if ( usercolor==null || usercolor==0 || usercolor>0 || usercolor.length==0 )usercolor=0xCCCCCC; new lz.chatTabItemEmoticons(this._cbtext,{ messageObj:messageObj,user_id:value[8], Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx Sun Dec 30 01:20:36 2012 @@ -112,22 +112,22 @@ <view name="_button" width="140" y="22" align="right"> - <miniIcons y="2" x="62" resource="font_preferences" - width="16" height="16" showhandcursor="true"> - <handler name="onclick"> - var pick = new lz.fontOptions(canvas,{ - btnRef:this.parent.parent, - x:(this.getAttributeRelative('x',canvas)-130), - y:(this.getAttributeRelative('y',canvas)-42) - }); - lz.ModeManager.makeModal(pick); - </handler> - <handler name="onmouseover"> - <!-- lost selection workaround --> - parent.parent.message._ctext.saveselection(); - </handler> - <labelTooltip labelid="1530" /> - </miniIcons> + <miniIconsImage y="2" x="62" width="16" height="16" + showhandcursor="true" src="$once{ canvas.getThemeImage('font_style') }"> + <handler name="onclick"> + var pick = new lz.fontOptions(canvas,{ + btnRef:this.parent.parent, + x:(this.getAttributeRelative('x',canvas)-130), + y:(this.getAttributeRelative('y',canvas)-42) + }); + lz.ModeManager.makeModal(pick); + </handler> + <handler name="onmouseover"> + <!-- lost selection workaround --> + parent.parent.message._ctext.saveselection(); + </handler> + <labelTooltip labelid="1530" /> + </miniIconsImage> <miniIcons y="2" x="82" resource="smile_chat_log_rsc" width="16" height="16" showhandcursor="true"> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Sun Dec 30 01:20:36 2012 @@ -129,7 +129,8 @@ if ($debug) Debug.write("onisopen",o); if (o) { canvas._chatcontent.doInitByOpen(); - content._content1._chattabbottom.updatefontbuttonvisible(); + if (canvas.currentRoomObject != null) + content._content1._chattabbottom.updatefontbuttonvisible(); this.doBlink = false; this._newMessage.setAttribute("visibility","hidden"); this._newMessage.setAttribute( "opacity", 0 ); Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1426876&r1=1426875&r2=1426876&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx Sun Dec 30 01:20:36 2012 @@ -127,8 +127,8 @@ <view name="_button" width="140" y="22" align="right"> - <miniIcons name="fontbutton" y="2" x="62" resource="font_preferences" - width="16" height="16" showhandcursor="true"> + <miniIconsImage name="fontbutton" y="2" x="62" width="16" height="16" + showhandcursor="true" src="$once{ canvas.getThemeImage('font_style') }" > <handler name="onclick"> var pick = new lz.fontOptions(canvas,{ btnRef:this.parent.parent, @@ -142,7 +142,7 @@ parent.parent.message._ctext.saveselection(); </handler> <labelTooltip labelid="1530" /> - </miniIcons> + </miniIconsImage> <miniIcons y="2" x="82" resource="smile_chat_log_rsc" width="16" height="16" showhandcursor="true"> 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=1426876&r1=1426875&r2=1426876&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 Dec 30 01:20:36 2012 @@ -24,12 +24,6 @@ <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" /> - <resource name="font_preferences" src="resources/font.png" /> - <resource name="font_bold" src="resources/text_bold.png" /> - <resource name="font_italic" src="resources/text_italic.png" /> - <resource name="font_underline" src="resources/text_underline.png" /> - <resource name="font_color" src="resources/text_color.png" /> - <resource name="insert_hyperlink" src="resources/text_hyperlink.png" /> <include href="simpleBaseTabpane.lzx" /> <include href="showChatLog.lzx" />