[Commits] r991 - in apps/opengeo/geoexplorer/trunk: . lib lib/GeoExplorer theme
commits at geoext.org
commits at geoext.org
Fri Jun 5 00:09:32 CEST 2009
Author: dwins
Date: 2009-06-05 00:09:32 +0200 (Fri, 05 Jun 2009)
New Revision: 991
Modified:
apps/opengeo/geoexplorer/trunk/debug.html
apps/opengeo/geoexplorer/trunk/embed-debug.html
apps/opengeo/geoexplorer/trunk/embed.html
apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed.js
apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full.js
apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
Log:
Add title display popup to 'about' dialog.
Modified: apps/opengeo/geoexplorer/trunk/debug.html
===================================================================
--- apps/opengeo/geoexplorer/trunk/debug.html 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/debug.html 2009-06-04 22:09:32 UTC (rev 991)
@@ -30,6 +30,12 @@
Ext.BLANK_IMAGE_URL = "theme/img/blank.gif";
var app = new GeoExplorer.Full({
proxy: "/proxy/?url=",
+ about: {
+ title: 'Example Map',
+ "abstract": 'A description of the map\'s contents',
+ keywords: "example, test, development",
+ contact: "Georj the Robot, Representative, OpenGeo, http://opengeo.org/"
+ },
ows: {
"local": "http://10.254.200.217/geoserver/ows/",
"notlocal": "http://10.254.200.217/geoserver/ows/"
Modified: apps/opengeo/geoexplorer/trunk/embed-debug.html
===================================================================
--- apps/opengeo/geoexplorer/trunk/embed-debug.html 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/embed-debug.html 2009-06-04 22:09:32 UTC (rev 991)
@@ -32,6 +32,12 @@
Ext.BLANK_IMAGE_URL = "theme/img/blank.gif";
var app = new GeoExplorer.Embed({
proxy: "/proxy/?url=",
+ about: {
+ title: 'Example Map',
+ "abstract": 'A description of the map\'s contents',
+ keywords: "example, test, development",
+ contact: "Georj the Robot, Outreach Tribe Leader, OpenGeo, http://opengeo.org/"
+ },
ows: {
"demo": "http://demo.opengeo.org/geoserver/ows"
},
Modified: apps/opengeo/geoexplorer/trunk/embed.html
===================================================================
--- apps/opengeo/geoexplorer/trunk/embed.html 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/embed.html 2009-06-04 22:09:32 UTC (rev 991)
@@ -17,6 +17,7 @@
<!-- GeoExt resources -->
<script type="text/javascript" src="externals/geoext/lib/GeoExt.js"></script>
+ <script type="text/javascript" src="externals/geoext/lib/GeoExt-LegendPanel.js"></script>
<link rel="stylesheet" type="text/css" href="externals/geoext/resources/css/geoext-all-debug.css" />
<link rel="stylesheet" type="text/css" href="externals/geoext/resources/css/gxtheme-gray.css" />
Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed.js 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed.js 2009-06-04 22:09:32 UTC (rev 991)
@@ -161,7 +161,8 @@
var aboutButton = new Ext.Button({
tooltip: "About this map",
iconCls: "icon-about",
- handler: this.displayAppInfo
+ handler: this.displayAppInfo,
+ scope: this
});
tools.push("->");
Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full.js 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full.js 2009-06-04 22:09:32 UTC (rev 991)
@@ -30,7 +30,8 @@
var aboutButton = new Ext.Button({
text: "GeoExplorer",
iconCls: "icon-geoexplorer",
- handler: this.displayAppInfo
+ handler: this.displayAppInfo,
+ scope: this
});
tools.unshift("-");
Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js 2009-06-04 22:09:32 UTC (rev 991)
@@ -1431,12 +1431,40 @@
* Display an informational dialog about the application.
*/
displayAppInfo: function() {
+ var appInfo = new Ext.Panel({
+ title: "GeoExplorer",
+ html: "<iframe style=\"border: none; height: 100%; width: 100%\" src=\"about.html\"><a target=\"_blank\" href=\"about.html\">About GeoExplorer</a> </iframe>"
+ });
+
+ var about = Ext.applyIf(this.about, {
+ title: '',
+ "abstract": '',
+ keywords: '',
+ contact: ''
+ });
+
+ var mapInfo = new Ext.Panel({
+ title: "Map Info",
+ html: '<div class="gx-info-panel">'
+ + '<h2> Title </h2> <p>' + about.title
+ + '</p> <h2> Abstract </h2> <p>' + about['abstract']
+ + '</p> <h2> Keywords </h2> <p>' + about.keywords
+ + '</p> <h2> Contact </h2> <p>' + about.contact +' </p> </div>',
+ height: 'auto',
+ width: 'auto'
+ });
+
+ var tabs = new Ext.TabPanel({
+ activeTab: 0,
+ width: 300,
+ height: 350,
+ items:[mapInfo, appInfo]
+ });
+
var win = new Ext.Window({
- title: "About GeoExplorer",
- html: "<iframe style=\"border: none; height: 100%; width: 100%\" src=\"about.html\"><a target=\"_blank\" href=\"about.html\">About GeoExplorer</a> </iframe>",
+ title: "About this Map",
modal: true,
- width: 300,
- height: 350
+ items: [tabs]
});
win.show();
}
Modified: apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css 2009-06-04 22:00:53 UTC (rev 990)
+++ apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css 2009-06-04 22:09:32 UTC (rev 991)
@@ -204,6 +204,10 @@
opacity: 1;
}
+.gx-info-panel p {
+ margin-bottom: 4px;
+}
+
.gx-wizard-description p {
margin: 4px auto;
background: none;
More information about the Commits
mailing list