Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change rule dialog to be conform new wireframes #137

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
+1,031 −1,470
Open

change rule dialog to be conform new wireframes #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
d2c05e2
Create legend properties fieldset in rule dialog
Apr 19, 2012
d5a03f1
more rearranging in the rule panel
Apr 19, 2012
9d485c6
move allowCQL option to FilterBuilder since we need this in more than…
Apr 20, 2012
d6f237a
use allowCQL on the filterbuilder now, so remove the code from here
Apr 20, 2012
77cc92b
more changes to align rule panel with wireframes
Apr 20, 2012
5c370d5
add symbolizer grid to rule panel, and fire change event when somethi…
Apr 20, 2012
3d4674d
implement removal of symbolizer from symbolgrid
Apr 23, 2012
d5b909b
add skeleton for rest of the toolbar
Apr 23, 2012
eb20676
add the layout config for having a symbolizer properties panel under …
Apr 23, 2012
dbe05aa
propagate the changes done in the properties panel
Apr 23, 2012
1bc1e2e
remove fieldsets from sub symbolizer forms, and only show properties …
Apr 24, 2012
5b436d6
actually get the symbolizer properties updated all the way the chain
Apr 24, 2012
5984b5b
only show high-level properties for point symbolizer
Apr 24, 2012
46d6d96
add scroll to symbolizer grid, and pass on AttributeStore to properti…
Apr 24, 2012
932c129
merge with master
May 30, 2012
2f1927e
Merge branch 'master' of github.com:opengeo/gxp into rule
Jun 7, 2012
6302f03
work in progress on implementing the new UI workflow, a major issue n…
Jun 7, 2012
67c9011
fix the issue that empty default symbolizers show up in the map even …
Jun 7, 2012
99f388d
also add an unchecked symbolizer for the current symbolType
Jun 8, 2012
410b488
automatically add new empty symbolizer when somebody checks a symboli…
Jun 8, 2012
070ff1a
changing a sub symbolizer should also change their status to checked
Jun 8, 2012
3e99ed6
more work on implementing the new workflow
Jun 8, 2012
ee814da
work in progress
Jun 8, 2012
55403eb
work in progress on having all PolygonSymbolizers combined in one nod…
Jun 10, 2012
0afa411
work in progress: restore composite feature swatch
Jun 11, 2012
98aedf5
work in progress
Jun 11, 2012
72d8545
work in progress
Jun 11, 2012
cc30c47
sort symbolizer tree by subtype
Jun 11, 2012
0bfb06c
clean up
Jun 11, 2012
9914048
automatically add new entry when the last one gets checked
Jun 11, 2012
3de8d02
sort tree after creating a new node, so that Stroke will be before Fill
Jun 11, 2012
ed6021b
re-implement getStyles
Jun 11, 2012
e6baada
fix up tests
Jun 11, 2012
690af11
partially fix up the SymbolizerLoader tests
Jun 11, 2012
5155cf8
correct swatch to use composite features, and cleanup non-used code
Jun 12, 2012
599ad41
make sure preview uses the right symbolType
Jun 12, 2012
527a23a
get point properties to work again
Jun 12, 2012
d9ae44e
pass on symbolType so featureRenderer works
Jun 12, 2012
26e1df1
make sure secondary symbolizers also get unchecked items at startup
Jun 12, 2012
246c36c
fix Safari issue with edit rule dialog, we were creating nested forms
Jun 12, 2012
6de5077
Point should have Graphic and Mark subtypes, work in progress
Jun 12, 2012
ce9c49d
ability to filter the PointSymbolizer dialog by subtype (GRAPHIC or M…
Jun 13, 2012
3b2f357
back to original Fill and Stroke Symbolizer dialogs with fieldsets
Jun 13, 2012
d0a1bb0
on checkchange, insert symbolizer in the array at the correct position
Jun 13, 2012
bc747e9
every subType of point should become its own PointSymbolizer
Jun 13, 2012
6dccfa8
improve the situation for point symbolizers
Jun 13, 2012
7dc788a
fix z-order issues
Jun 13, 2012
1f62eaf
no title when not used a fieldset
Jun 13, 2012
29113bc
fix sequence issue in PolygonSymbolizers when saving
Jun 13, 2012
c2aa382
fix layout issues
Jun 14, 2012
a644d23
improvements for Text
Jun 14, 2012
197698d
use column name in text for Label node
Jun 14, 2012
52ecdf1
update the text of the node when the label column changes
Jun 14, 2012
046342c
prevent firing two change events on first render
Jun 14, 2012
8297d9a
use labelText in rule panel's swatch as well
Jun 14, 2012
3f5bc30
start on drag and drop support
Jun 14, 2012
ac26f65
only allow drag & drop if the parent node is the same
Jun 14, 2012
00dfde7
fix up the symbolizer grid example
Jun 15, 2012
b6eb175
show and hide feature swatches on checkchange to match the UI design
Jun 15, 2012
b4969c3
implement drag & drop at the highest level
Jun 15, 2012
c98aded
minor fixes
Jun 15, 2012
d13a976
make sure sequence of high-level symbolizers is reflected in the SLD
Jun 15, 2012
bb36ce2
make sure initial sequence of tree reflects sequence in SLD
Jun 15, 2012
45bb0a5
put unused newly created symbolizers at the bottom, and update tests
Jun 15, 2012
e236d51
missing api docs, cleanup
Jun 15, 2012
ceeb937
add missing scope
Jun 17, 2012
66b77ae
a bit more test coverage
Jun 17, 2012
08f6973
merge with master
Jul 18, 2012
357d8fc
Merge branch 'rule' of github.com:bartvde/gxp into rule
ahocevar Jul 31, 2012
dbda492
Do not include Ext.ux code in gxp.
ahocevar Jul 31, 2012
90bb755
Adding styler plugin.
ahocevar Jul 31, 2012
51d411e
Merge branch 'rule' of git://github.com/ahocevar/gxp into rule
Aug 1, 2012
839c5b0
improve the layout of the symbolizer grid (see #137)
Aug 2, 2012
8b6a108
have proper autoScroll in properties panel by specifying height
Aug 2, 2012
0c43b86
fix issue with having a stroke on a PolygonSymbolizer that should not…
Aug 2, 2012
31defdd
remove save button since we are auto-saving anyway, and change Cancel…
Aug 2, 2012
ded9e4f
do not output warning for records that have no name set
Aug 2, 2012
ab45c75
on authorization change, check for this.url instead of this.store.url…
Aug 3, 2012
e70a221
improve the dragging performance of the Simile timeline by using thro…
Aug 3, 2012
30de82c
take the throttle implementation from Ext JS 4.1 instead
Aug 6, 2012
8fbdbfc
add option to timeline to optionally hide rangeSlider
Aug 7, 2012
50c943d
fix @requires tag
Aug 8, 2012
6431ba1
perform query when pressing ENTER
Aug 8, 2012
d1f9727
prevent empty string from being a title in the AddLayers combo box (c…
Aug 14, 2012
d0cbf29
set this.selectedSource properly in CatalogueSearchPanel if there is …
Aug 16, 2012
62eba4b
remove accidentally committed .swp file
Aug 16, 2012
d9fa67e
Handling error messages returned by server (SUITE-798).
ahocevar Aug 16, 2012
c3e1605
Merge branch 'rule' of git://github.com/opengeo/gxp into rule
ahocevar Sep 3, 2012
4478978
Using vbox layout instead of fixed heights
ahocevar Sep 4, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/filters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ <h1>Filter Builders</h1>

<div id="panel1"></div>
<p>Setting allowGroups to false disallows nested logical filters.</p>

<div id="panelcql"></div>
<p>Setting allowCQL to true provides to option to specify the filter as CQL.</p>

<div id="panel2"></div>
<p>The above filter builder allows group conditions.</p>
Expand Down
23 changes: 23 additions & 0 deletions examples/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,29 @@ Ext.onReady(function() {
}]
});

var panelcql = new Ext.Panel({
title: "Filter Builder (no groups, but with CQL option)",
renderTo: "panelcql",
width: 320,
items: [{
xtype: "gxp_filterbuilder",
style: "padding: .3em .3em .1em .1em",
allowGroups: false,
allowCQL: true,
filter: filter.clone(),
attributes: new GeoExt.data.AttributeStore({
url: "data/describe_feature_type.xml",
ignore: {name: "the_geom"}
})
}],
bbar: ["->", {
text: "View Filter Encoding",
handler: function() {
showFE(panel1);
}
}]
});

var panel2 = new Ext.Panel({
title: "Filter Builder (with groups)",
renderTo: "panel2",
Expand Down
15 changes: 7 additions & 8 deletions examples/symbolizer-grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-3.4.0/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-3.4.0/examples/shared/examples.css" />
<link rel="stylesheet" type="text/css" href="./ux/treegrid/treegrid.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/treegrid.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../src/theme/all.css"/>
<script src="http://extjs.cachefly.net/ext-3.4.0/adapter/ext/ext-base.js"></script>
<script src="http://extjs.cachefly.net/ext-3.4.0/ext-all-debug.js"></script>

<script type="text/javascript" src="./ux/treegrid/TreeGridSorter.js"></script>
<script type="text/javascript" src="./ux/treegrid/TreeGridColumnResizer.js"></script>
<script type="text/javascript" src="./ux/treegrid/TreeGridNodeUI.js"></script>
<script type="text/javascript" src="./ux/treegrid/TreeGridLoader.js"></script>

<script type="text/javascript" src="./ux/treegrid/TreeGridColumns.js"></script>
<script type="text/javascript" src="./ux/treegrid/TreeGrid.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGridSorter.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGridColumnResizer.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGridNodeUI.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGridLoader.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGridColumns.js"></script>
<script type="text/javascript" src="http://extjs.cachefly.net/ext-3.4.0/examples/ux/treegrid/TreeGrid.js"></script>

<script src="../externals/openlayers/lib/OpenLayers.js"></script>
<script src="../externals/geoext/lib/GeoExt.js"></script>
Expand Down
5 changes: 1 addition & 4 deletions examples/symbolizer-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ symbolizers.push(new OpenLayers.Symbolizer.Point({
strokeColor: "red",
strokeWidth: 1
}));
symbolizers.push(new OpenLayers.Symbolizer.Line({
strokeColor: "#669900",
strokeWidth: 3
}));
symbolizers.push(new OpenLayers.Symbolizer.Polygon({
fillColor: "olive",
fillOpacity: 0.25,
Expand Down Expand Up @@ -64,6 +60,7 @@ var showSLD = function() {
Ext.onReady(function() {
grid = new gxp.grid.SymbolizerGrid({
symbolizers: symbolizers,
symbolType: "Polygon",
height: 375,
width: 400,
renderTo: "grid",
Expand Down
Loading