[fusion-commits] r1494 - sandbox/jx2/templates/mapguide/standard
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Thu Sep 4 13:42:46 EDT 2008
Author: madair
Date: 2008-09-04 13:42:46 -0400 (Thu, 04 Sep 2008)
New Revision: 1494
Modified:
sandbox/jx2/templates/mapguide/standard/ApplicationDefinition.xml
sandbox/jx2/templates/mapguide/standard/index.html
Log:
fixes to get MapGuide working
Modified: sandbox/jx2/templates/mapguide/standard/ApplicationDefinition.xml
===================================================================
--- sandbox/jx2/templates/mapguide/standard/ApplicationDefinition.xml 2008-09-04 17:18:46 UTC (rev 1493)
+++ sandbox/jx2/templates/mapguide/standard/ApplicationDefinition.xml 2008-09-04 17:42:46 UTC (rev 1494)
@@ -307,7 +307,7 @@
<StatusItem>The map.</StatusItem>
<Extension xsi:type="CustomContentType">
<MenuContainer>MapContextMenu</MenuContainer>
- <Scales>2000000 1000000 500000 250000 125000 50000</Scales>
+ <Scales>100000,50000,25000,12500,8000,4000</Scales>
</Extension>
<MapId>sheboygan</MapId>
</MapWidget>
@@ -1007,16 +1007,16 @@
<Disabled/>
</Widget>
-<!-- OVERVIEW MAP -->
+<!-- OVERVIEW MAP
<Widget xsi:type="WidgetType">
<Name>OverviewMap</Name>
<Type>OverviewMap</Type>
<Description/>
<Extension xsi:type="CustomContentType">
- <!--MapId>sheboyganOverview</MapId-->
+ <MapId>sheboyganOverview</MapId>
</Extension>
- </Widget>
+ </Widget>-->
<!-- PRINT -->
Modified: sandbox/jx2/templates/mapguide/standard/index.html
===================================================================
--- sandbox/jx2/templates/mapguide/standard/index.html 2008-09-04 17:18:46 UTC (rev 1493)
+++ sandbox/jx2/templates/mapguide/standard/index.html 2008-09-04 17:42:46 UTC (rev 1494)
@@ -7,46 +7,8 @@
<script type="text/javascript" src="../../../lib/fusion.js"></script>
<style type="text/css">
- @import url(../../../jx/css/jxskin-border.css);
-
- .jxSplitterBar {
- width: 2px;
- background-color: #999;
- cursor: 'col-resize';
- }
+ @import url(../../../jx/lib/jxskin_delicious.css);
- body {
- overflow: hidden;
- }
-
- #Toolbar .jxToolbar {
- /*width: 100%;*/
- }
-
- #TaskPane .jxPanelContent {
- border-left: 1px solid #fff;
- }
-
- #Map {
- position: relative;
- border-right: 1px solid #999;
- border-bottom: 1px solid #999;
- }
-
- #Statusbar {
- overflow: hidden;
- background-color: #d9d9d9;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
-
- #Statusbar .jxSplitterBar {
- width: 1px;
- border-left: 1px solid #999;
- border-right: 1px solid #fff;
- cursor: 'col-resize';
- }
-
#Statusbar .spanCursorPosition,
#Statusbar .inputEditableScale,
#Statusbar .spanViewSize,
@@ -56,14 +18,7 @@
line-height: 18px;
}
- #Scalebar {
- position: absolute;
- bottom: 5px;
- left: 5px;
- z-index: 1001;
- }
-
li.jxToolItem.activityIndicator {
float: right;
padding: 6px 3px;
@@ -78,32 +33,49 @@
window.onload = function() {
/* make 'thePage' just fill the browser window and resize automagically
the user resizes the browser */
- new Jx.Layout('thePage');
- /* the height of toolbars. For jxskin-border,
- * its 28 and for jxskin-graphic its 30 */
- var h = 28;
- new Jx.Layout('Main', {bottom: 22, right: 250});
- new Jx.Layout('Statusbar', {height: 22, top: null});
- new Jx.Layout('TaskPane', {bottom: 22, width: 250, left: null});
- new Jx.Layout('Toolbar', {height: h, bottom: null});
- new Jx.Layout('Splitter', {top: h});
+ new Jx.Layout('thePage').resize();
+
+ var topToolbar = new Jx.Toolbar({id: 'Toolbar', position: 'top'});
+ var mainPanel = new Jx.Panel({
+ id: 'Main',
+ hideTitle: true,
+ toolbars: [topToolbar]
+ });
+ mainPanel.addTo('thePage')
+ new Jx.Layout('Main', {right: 250, bottom: 30});
+ new Jx.Layout('TaskPane', {width: 250, left: null, bottom: 30});
+ new Jx.Layout('Statusbar', {height: 30, top: null});
+
+ new Jx.Splitter(mainPanel.content, {
+ elements: ['PanelPane', 'Map'],
+ containerOptions: [{width: 200}, {}]
+ });
- var splitter = new Jx.Splitter('Splitter', {elements: [$('PanelPane'), $('Map')], containerOptions: [{width: 200}, {}]});
-
- //new Jx.Splitter('Statusbar', {elements: [$('CursorPosition'), $('SelectionInfo'), $('EditableScale'), $('ViewSize'), $('PoweredBy')], containerOptions: [{}, {}, {}, {}, {width: 143, maxWidth: 143, minWidth: 143}]});
-
- var p1 = new Jx.Panel({label: 'Legend'});
- p1.content.id = 'Legend';
- var p2 = new Jx.Panel({label: 'Selection'});
- p2.content.id = 'SelectionPanel';
- var p3 = new Jx.Panel({label: 'Overview Map'});
- p3.content.id = 'OverviewMap';
+ var p1 = new Jx.Panel({
+ label: 'Legend',
+ content: 'Legend',
+ collapse: false,
+ maximize: true
+ });
+ var p2 = new Jx.Panel({
+ label: 'Selection',
+ content: 'SelectionPanel',
+ collapse: false,
+ maximize: true
+ });
+ var p3 = new Jx.Panel({
+ label: 'Overview Map',
+ content: 'OverviewMap',
+ collapse: false,
+ maximize: true
+ });
var pm = new Jx.PanelSet('PanelPane', [p1, p2, p3]);
-
- $('thePage').resize();
- $('thePage').style.visibility = 'visible';
-
- Fusion.registerForEvent(Fusion.Event.FUSION_INITIALIZED, fusionInitialized);
+
+ Fusion.registerForEvent(Fusion.Event.FUSION_INITIALIZED, function() {
+ $('thePage').resize({forceResize: true});
+ $('thePage').style.visibility = 'visible';
+ mainPanel.layoutContent();
+ });
Fusion.registerForEvent(Fusion.Event.FUSION_ERROR, fusionError);
Fusion.initialize();
}
@@ -112,14 +84,6 @@
console.log('Fusion Error: \n' + error.toString());
}
-function fusionInitialized() {
- $('thePage').jxLayout.resize({forceResize:true});
- $('Toolbar').jxLayout.resize({forceResize:true});
- //var map = Fusion.getWidgetById('Map');
- //var l = new Jx.Layout($('Toolbar').childNodes[0]);
- //l.resize();
-}
-
</script>
</head>
@@ -127,26 +91,20 @@
<div id="thePage" style="visibility: hidden">
- <div id="Main">
- <div id="Toolbar"></div>
- <div id="Splitter">
- <div id="PanelPane"></div>
- <div id="Map">
- <div id="Navigator"></div>
- <div id="Scalebar"></div>
- </div>
- </div>
- </div>
+<div id="PanelPane">
+ <div id="Legend"></div>
+ <div id="SelectionPanel"></div>
+ <div id="OverviewMap"></div>
+</div>
+<div id="Map"><div id="Navigator"></div></div>
+<div id="Statusbar"></div>
+<div id="TaskPane"></div>
+<div id="PoweredBy" class="statusBarItem">
+<a href="http://mapserver.gis.umn.edu.org/" target="_blank">
+ <img src="images/PoweredBy_MapServer.gif" width="137" height="18" border="0">
+</a>
+</div>
- <div id="TaskPane"></div>
- <div id="Statusbar"></div>
- <div id="MapTip"></div>
- <div id="PoweredBy" class="statusBarItem">
- <a href="http://mapserver.gis.umn.edu.org/" target="_blank">
- <img src="images/PoweredBy_MapServer.gif" width="137" height="18" border="0">
- </a>
- </div>
-
</div>
<div id="BusyIndicator" style="visibility: hidden;">
More information about the fusion-commits
mailing list