Navigation

← Previous Changeset
Next Changeset →

Changeset 1165

Timestamp:

06/30/09 00:12:56 (4 years ago)

Author:

tschaub

Message:

Restructuring things. Putting differences between build profiles in the build config file. Going with ant to simplify use as an extension and allow cross-platform building. Only development implemented.

Files:

apps/opengeo/geoexplorer/trunk/build/build.xml (added)
apps/opengeo/geoexplorer/trunk/src (added)
apps/opengeo/geoexplorer/trunk/src/html (added)
apps/opengeo/geoexplorer/trunk/src/html/about.html (moved) (moved from apps/opengeo/geoexplorer/trunk/about.html) (1 diff, 1 prop)
apps/opengeo/geoexplorer/trunk/src/html/debug.html (moved) (moved from apps/opengeo/geoexplorer/trunk/debug.html) (2 diffs, 1 prop)
apps/opengeo/geoexplorer/trunk/src/html/embed-debug.html (moved) (moved from apps/opengeo/geoexplorer/trunk/embed-debug.html) (2 diffs, 1 prop)
apps/opengeo/geoexplorer/trunk/src/html/embed-example.html (moved) (moved from apps/opengeo/geoexplorer/trunk/embed-example.html) (1 prop)
apps/opengeo/geoexplorer/trunk/src/html/embed.html (moved) (moved from apps/opengeo/geoexplorer/trunk/embed.html) (1 prop)
apps/opengeo/geoexplorer/trunk/src/html/index.html (moved) (moved from apps/opengeo/geoexplorer/trunk/index.html) (1 prop)
apps/opengeo/geoexplorer/trunk/src/script (added)
apps/opengeo/geoexplorer/trunk/src/script/app (added)
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer (moved) (moved from apps/opengeo/geoexplorer/trunk/lib/GeoExplorer) (1 prop)
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer.js (moved) (moved from apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js) (1 prop)
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/Full.js (modified) (1 diff)
apps/opengeo/geoexplorer/trunk/src/script/app/loader.js (moved) (moved from apps/opengeo/geoexplorer/trunk/script/GeoExplorer-debug.js) (1 diff, 1 prop)
apps/opengeo/geoexplorer/trunk/src/script/ux (added)
apps/opengeo/geoexplorer/trunk/src/script/ux/RowExpander.js (moved) (moved from apps/opengeo/geoexplorer/trunk/lib/Ext/grid/RowExpander.js) (1 prop)
apps/opengeo/geoexplorer/trunk/src/theme (added)
apps/opengeo/geoexplorer/trunk/src/theme/app (moved) (moved from apps/opengeo/geoexplorer/trunk/theme) (1 prop)
apps/opengeo/geoexplorer/trunk/src/theme/app/geoexplorer.css (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

apps/opengeo/geoexplorer/trunk/src/html/about.html

Property svn:mergeinfo set

r482	r1165
2	2	<head>
3	3	<title>About GeoExplorer</title>
4		<link rel="stylesheet" type="text/css" href="theme/about.css"/> </head>
	4	<link rel="stylesheet" type="text/css" href="@about.css@"/>
	5	</head>
5	6	<body>
6	7	<div class="logo"></div>

apps/opengeo/geoexplorer/trunk/src/html/debug.html

Property svn:mergeinfo set

r1106	r1165
2	2	<html>
3	3	<head>
4		<title>~~GeoExplorer (debug)~~</title>
	4	<title>@title@</title>
5	5
6	6	<!-- IE 8 Compatibility -->
…	…
11	11	<link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-2.2.1/resources/css/xtheme-gray.css" />
12	12	<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/adapter/ext/ext-base.js"></script>
13		<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/~~ext-all-debug.js~~"></script>
	13	<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/@ext-all.js@"></script>
14	14
15	15	<!-- OpenLayers resources -->
16		<link rel="stylesheet" type="text/css" href="~~externals/openlayers/theme/default/style.css~~" />
17		<script type="text/javascript" src="~~externals/openlayers/lib/OpenLayers.js~~"></script>
	16	<link rel="stylesheet" type="text/css" href="@ol-style.css@" />
	17	<script type="text/javascript" src="@OpenLayers.js@"></script>
18	18
19	19	<!-- GeoExt resources -->
20		<~~script type="text/javascript" src="externals/geoext/lib/GeoExt.js"></script>~~
21		<link rel="stylesheet" type="text/css" href="~~externals/geoext/resources/css/geoext-all-debug.css~~" />
22		<~~link rel="stylesheet" type="text/css" href="externals/geoext/resources/css/gxtheme-gray.css" />~~
	20	<link rel="stylesheet" type="text/css" href="@geoext-all.css@" />
	21	<link rel="stylesheet" type="text/css" href="@gxtheme-gray.css@" />
	22	<script type="text/javascript" src="@GeoExt.js@"></script>
23	23
24	24	<!-- GeoExplorer resources -->
25		<link rel="stylesheet" type="text/css" href="theme/geoexplorer.css" />
26		<!--[if IE]>
27		<link rel="stylesheet" type="text/css" href="theme/ie.css"/><![endif]-->
28
29
30		<script type="text/javascript" src="script/GeoExplorer-debug.js"></script>
	25	<link rel="stylesheet" type="text/css" href="@geoexplorer.css@" />
	26	<!--[if IE]><link rel="stylesheet" type="text/css" href="@ie.css@"/><![endif]-->
	27	<script type="text/javascript" src="@GeoExplorer.js@"></script>
	28	<script type="text/javascript" src="@ux.js@"></script>
31	29
32	30	<script>
33		Ext.BLANK_IMAGE_URL = "theme/img/blank.gif";
	31	Ext.BLANK_IMAGE_URL = "../../theme/img/blank.gif";
34	32	var app = new GeoExplorer.Full({
35	33	proxy: "/proxy/?url=",
36	34	about: {
37		title: ~~'Example Map'~~,
38		"abstract": ~~'A description of the map\'s contents'~~,
	35	title: "Example Map",
	36	"abstract": "A description of the map's contents",
39	37	keywords: "example, test, development",
40	38	contact: "Georj the Robot, Representative, OpenGeo, http://opengeo.org/"

apps/opengeo/geoexplorer/trunk/src/html/embed-debug.html

Property svn:mergeinfo set

r1106	r1165
2	2	<html>
3	3	<head>
4		<title>~~GeoExplorer Embedded (debug)~~</title>
	4	<title>@title@</title>
5	5
6	6	<!-- IE 8 Compatibility -->
7	7	<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
8
9		~~<!-- This file is expected to go into an iframe. -->~~
10		~~<script type="text/javascript" src="externals/openlayers/lib/Firebug/firebug.js"></script>~~
11	8
12	9	<!-- Ext resources -->
…	…
14	11	<link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-2.2.1/resources/css/xtheme-gray.css" />
15	12	<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/adapter/ext/ext-base.js"></script>
16		<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/~~ext-all-debug.js~~"></script>
	13	<script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/@ext-all.js@"></script>
17	14
18	15	<!-- OpenLayers resources -->
19		<link rel="stylesheet" type="text/css" href="~~externals/openlayers/theme/default/style.css~~" />
20		<script type="text/javascript" src="~~externals/openlayers/lib/OpenLayers.js~~"></script>
	16	<link rel="stylesheet" type="text/css" href="@ol-style.css@" />
	17	<script type="text/javascript" src="@OpenLayers.js@"></script>
21	18
22	19	<!-- GeoExt resources -->
23		<~~script type="text/javascript" src="externals/geoext/lib/GeoExt.js"></script>~~
24		<link rel="stylesheet" type="text/css" href="~~externals/geoext/resources/css/geoext-all-debug.css~~" />
25		<~~link rel="stylesheet" type="text/css" href="externals/geoext/resources/css/gxtheme-gray.css" />~~
	20	<link rel="stylesheet" type="text/css" href="@geoext-all.css@" />
	21	<link rel="stylesheet" type="text/css" href="@gxtheme-gray.css@" />
	22	<script type="text/javascript" src="@GeoExt.js@"></script>
26	23
27	24	<!-- GeoExplorer resources -->
28		<link rel="stylesheet" type="text/css" href="theme/geoexplorer.css" />
29		<!--[if IE]>
30		<link rel="stylesheet" type="text/css" href="theme/ie.css"/><![endif]-->
31
32		<script type="text/javascript" src="script/GeoExplorer-debug.js"></script>
	25	<link rel="stylesheet" type="text/css" href="@geoexplorer.css@" />
	26	<!--[if IE]><link rel="stylesheet" type="text/css" href="@ie.css@"/><![endif]-->
	27	<script type="text/javascript" src="@GeoExplorer.js@"></script>
33	28
34	29	<script>

apps/opengeo/geoexplorer/trunk/src/html/embed-example.html
- Property svn:mergeinfo set
apps/opengeo/geoexplorer/trunk/src/html/embed.html
- Property svn:mergeinfo set
apps/opengeo/geoexplorer/trunk/src/html/index.html
- Property svn:mergeinfo set
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer
- Property svn:mergeinfo set
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer.js
- Property svn:mergeinfo set

apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/Full.js

r991	r1165
114	114
115	115	// TODO: configurablize!!!1!!!!!111!!!!!!
116		var pathname = document.location.pathname.replace(/\/[^\/]*$/, '/embed~~-debug~~.html');
	116	var pathname = document.location.pathname.replace(/\/[^\/]*$/, '/embed.html');
117	117	var url =
118	118	document.location.protocol + "//" +

apps/opengeo/geoexplorer/trunk/src/script/app/loader.js

Property svn:mergeinfo set

r987	r1165
4	4	// the base, all these includes must be prefixed by a ../
5	5	var jsfiles = new Array(
6		"lib/GeoExplorer.js",
7		"lib/GeoExplorer/util.js",
8		"lib/Ext/grid/RowExpander.js",
9		"lib/GeoExplorer/MapToolToggle.js",
10		"lib/GeoExplorer/MapToolSplitToggle.js",
11		"lib/GeoExplorer/MapToolMenu.js",
12		"lib/GeoExplorer/Wizard.js",
13		"lib/GeoExplorer/LayerMenuItem.js",
14		"lib/GeoExplorer/CapabilitiesGrid.js",
15		"lib/GeoExplorer/GroupContainer.js",
16		"lib/GeoExplorer/Full.js",
17		"lib/GeoExplorer/Embed.js",
18		"lib/GeoExplorer/NewSourceWindow.js"
	6	"../../src/script/app/GeoExplorer.js",
	7	"../../src/script/app/GeoExplorer/util.js",
	8	"../../src/script/app/GeoExplorer/MapToolToggle.js",
	9	"../../src/script/app/GeoExplorer/MapToolSplitToggle.js",
	10	"../../src/script/app/GeoExplorer/MapToolMenu.js",
	11	"../../src/script/app/GeoExplorer/Wizard.js",
	12	"../../src/script/app/GeoExplorer/LayerMenuItem.js",
	13	"../../src/script/app/GeoExplorer/CapabilitiesGrid.js",
	14	"../../src/script/app/GeoExplorer/GroupContainer.js",
	15	"../../src/script/app/GeoExplorer/Full.js",
	16	"../../src/script/app/GeoExplorer/Embed.js",
	17	"../../src/script/app/GeoExplorer/NewSourceWindow.js"
19	18	);
20	19

apps/opengeo/geoexplorer/trunk/src/script/ux/RowExpander.js
- Property svn:mergeinfo set
apps/opengeo/geoexplorer/trunk/src/theme/app
- Property svn:mergeinfo set

apps/opengeo/geoexplorer/trunk/src/theme/app/geoexplorer.css

r991	r1165
118	118
119	119	.olControlPanPanel div {
120		background-image:url(~~../externals/ext~~/resources/images/gray/panel/tool-sprites.gif);
	120	background-image:url(http://extjs.cachefly.net/ext-2.2.1/resources/images/gray/panel/tool-sprites.gif);
121	121	height:15px;
122	122	width:15px;
…	…
150	150
151	151	.olControlZoomPanel div {
152		background-image:url(~~../externals/ext~~/resources/images/gray/panel/tool-sprites.gif);
	152	background-image:url(http://extjs.cachefly.net/ext-2.2.1/resources/images/gray/panel/tool-sprites.gif);
153	153	height:15px;
154	154	width:15px;

Navigation

Changeset 1165

Legend:

Download in other formats: