You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/19 19:02:27 UTC
svn commit: r1363425 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/
openmeetings/public/themes/basic-theme/general/ src/ src/base/
Author: solomax
Date: Thu Jul 19 17:02:26 2012
New Revision: 1363425
URL: http://svn.apache.org/viewvc?rev=1363425&view=rev
Log:
OPENMEETINGS-361 is implemented
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
- copied, changed from r1363360, incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/logo.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1363425&r1=1363424&r2=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Thu Jul 19 17:02:26 2012
@@ -20,7 +20,7 @@
-->
<config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="openmeetings-config.xsd">
+ xsi:noNamespaceSchemaLocation="config.xsd">
<!-- URL/IP to use for the Server
if this value is empty it will try to connect to the
@@ -87,6 +87,14 @@ of the red5-servlet
-->
<currentappnameurl>http://incubator.apache.org/openmeetings</currentappnameurl>
+<!--
+ Should APP name and/or logo be displayed
+-->
+<appdisplay>
+ <displayelement name="logo" display="true" x="5" y="5"/>
+ <displayelement name="name" display="true" x="140" y="10"/>
+</appdisplay>
+
<!--
URL to Bugs/Support
this is the URL which is used if you click on *report a bug*
Copied: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd (from r1363360, incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd&r1=1363360&r2=1363425&rev=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd Thu Jul 19 17:02:26 2012
@@ -32,6 +32,7 @@
<xs:element ref="proxyType"/>
<xs:element ref="currentappname"/>
<xs:element ref="currentappnameurl"/>
+ <xs:element ref="appdisplay"/>
<xs:element ref="currentappnamebugurl"/>
<xs:element ref="loudnessAcitviation"/>
<xs:element ref="webAppRootKey"/>
@@ -83,6 +84,21 @@
<xs:element name="proxyType" type="xs:NCName"/>
<xs:element name="currentappname" type="xs:string"/>
<xs:element name="currentappnameurl" type="xs:anyURI"/>
+ <xs:element name="appdisplay">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="2" minOccurs="2" ref="displayelement"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="displayelement">
+ <xs:complexType>
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ <xs:attribute name="display" use="required" type="xs:boolean"/>
+ <xs:attribute name="x" use="required" type="xs:integer"/>
+ <xs:attribute name="y" use="required" type="xs:integer"/>
+ </xs:complexType>
+ </xs:element>
<xs:element name="currentappnamebugurl" type="xs:anyURI"/>
<xs:element name="loudnessAcitviation" type="xs:integer"/>
<xs:element name="webAppRootKey" type="xs:NCName"/>
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=1363425&r1=1363424&r2=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml Thu Jul 19 17:02:26 2012
@@ -54,6 +54,10 @@
description="color of text for menus" />
<!-- Icons -->
+ <resource name="logo_image"
+ description="Logo to display on Main BG Navi"
+ license="APL"
+ src="public/themes/basic-theme/general/logo.png" />
<resource name="icon_facebook_rsc_png"
description="Icon for facebook button in login"
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/logo.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/logo.png?rev=1363425&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1363425&r1=1363424&r2=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Jul 19 17:02:26 2012
@@ -246,8 +246,17 @@
}
mainBaseText.setAttribute('text',canvas.currentappname);
+ var elemPrefix = "config/appdisplay/displayelement";
+ var cfgDp = canvas.myConfigSet.getPointer();
+ mainBaseText.setAttribute('x', cfgDp.xpathQuery(elemPrefix + "[@name='name']/@x"));
+ mainBaseText.setAttribute('y', cfgDp.xpathQuery(elemPrefix + "[@name='name']/@y"));
+ mainBaseText.setAttribute('visible', "true" == cfgDp.xpathQuery(elemPrefix + "[@name='name']/@display"));
mainBaseText.setShadow();
mainBaseTextLabel.setAttribute('text',canvas.currentappnameurl);
+ mainApplogo.setAttribute('src', getThemeImage('logo_image'));
+ mainApplogo.setAttribute('x', cfgDp.xpathQuery(elemPrefix + "[@name='logo']/@x"));
+ mainApplogo.setAttribute('y', cfgDp.xpathQuery(elemPrefix + "[@name='logo']/@y"));
+ mainApplogo.setAttribute('visible', "true" == cfgDp.xpathQuery(elemPrefix + "[@name='logo']/@display"));
var cleanUrl = _url;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1363425&r1=1363424&r2=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Thu Jul 19 17:02:26 2012
@@ -92,7 +92,8 @@
<!-- View for Navigation-bar and App-name -->
<view name="_mainbgcontentNavi" x="0" y="0" clip="true"
width="100%" height="${ canvas.naviHeight }" visibility="hidden">
- <text id="mainBaseText" x="10" y="10"
+ <image id="mainApplogo" visible="false" />
+ <text id="mainBaseText" visible="false"
fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
<method name="setShadow" >
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1363425&r1=1363424&r2=1363425&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Thu Jul 19 17:02:26 2012
@@ -92,7 +92,8 @@
<!-- View for Navigation-bar and App-name -->
<view name="_mainbgcontentNavi" x="0" y="0" clip="true"
width="100%" height="${ canvas.naviHeight }" visibility="hidden">
- <text id="mainBaseText" x="10" y="10"
+ <image id="mainApplogo" visible="false" />
+ <text id="mainBaseText" visible="false"
fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
<method name="setShadow" >
<![CDATA[