Merge pull request #184 from saw-leipzig/issue108

Issue108
saw-leipzig · Jan 28, 2019 · 890fde6 · 890fde6
2 parents 2178544 + 9199fee
commit 890fde6
Show file tree

Hide file tree

Showing 17 changed files with 535 additions and 423 deletions.
diff --git a/src/de/cses/client/MainView.java b/src/de/cses/client/MainView.java
@@ -69,7 +69,7 @@
 public class MainView implements IsWidget {
 
 	// this footer will be shown at the bottom of the WebApp
-	private static final String FOOTER_TEXT = "\u00A9 2019 Sächsische Akademie der Wissenschaften zu Leipzig (Version 0.9.1)";
+	private static final String FOOTER_TEXT = "\u00A9 2019 Sächsische Akademie der Wissenschaften zu Leipzig (Version 0.9.2)";
 
 	private BorderLayoutContainer view = null;
 	private CaveSearchController caveSearchController;

diff --git a/src/de/cses/client/caves/CaveFilter.java b/src/de/cses/client/caves/CaveFilter.java
@@ -191,6 +191,7 @@ public SafeHtml render(CaveTypeEntry entry) {
 		caveTypePanel.setHeaderVisible(true);
 		caveTypePanel.setHeading("Cave Types");
 		caveTypePanel.add(caveTypeSelectionLV);
+		caveTypePanel.getHeader().setStylePrimaryName("frame-header");
 
 		ToolButton caveTypeSelectionResetTB = new ToolButton(new IconConfig("resetButton", "resetButtonOver"));
 		caveTypeSelectionResetTB.setToolTip(Util.createToolTip("Reset selection"));
@@ -202,6 +203,7 @@ public void onSelect(SelectEvent event) {
 			}
 		});
 		caveTypePanel.addTool(caveTypeSelectionResetTB);
+
 
 		siteSelectionLV = new ListView<SiteEntry, SiteEntry>(siteEntryList, new IdentityValueProvider<SiteEntry>(), new SimpleSafeHtmlCell<SiteEntry>(new AbstractSafeHtmlRenderer<SiteEntry>() {
 			final SiteViewTemplates svTemplates = GWT.create(SiteViewTemplates.class);
@@ -217,6 +219,8 @@ public SafeHtml render(SiteEntry entry) {
 		sitePanel.setHeaderVisible(true);
 		sitePanel.setHeading("Sites");
 		sitePanel.add(siteSelectionLV);
+		sitePanel.getHeader().setStylePrimaryName("frame-header");
+
 
 		ToolButton siteSelectionResetTB = new ToolButton(new IconConfig("resetButton", "resetButtonOver"));
 		siteSelectionResetTB.setToolTip(Util.createToolTip("Reset selection"));
@@ -243,6 +247,8 @@ public SafeHtml render(DistrictEntry entry) {
 		districtPanel.setHeaderVisible(true);
 		districtPanel.setHeading("Districts");
 		districtPanel.add(districtSelectionLV);
+		districtPanel.getHeader().setStylePrimaryName("frame-header");
+
 
 		ToolButton districtSelectionResetTB = new ToolButton(new IconConfig("resetButton", "resetButtonOver"));
 		districtSelectionResetTB.setToolTip(Util.createToolTip("Reset selection"));
@@ -278,6 +284,8 @@ public SafeHtml render(RegionEntry entry) {
 		regionPanel.setHeaderVisible(true);
 		regionPanel.setHeading("Regions");
 		regionPanel.add(regionSelectionLV);
+		regionPanel.getHeader().setStylePrimaryName("frame-header");
+
 
 		ToolButton regionSelectionResetTB = new ToolButton(new IconConfig("resetButton", "resetButtonOver"));
 		regionSelectionResetTB.setToolTip(Util.createToolTip("Reset selection"));

diff --git a/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java b/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java
@@ -91,8 +91,8 @@ public class OrnamentCaveRelationEditor {
 
 	public OrnamentCaveRelationEditor() {
 
-		// Zweite Ebene der Ornamentik. Eigenschaften, die von der Höhle abhängen.
-		//Erstellen aller Listen und Properties
+		// Zweite Ebene der Ornamentik. Eigenschaften, die von der Hoehle abhaengen.
+		// Erstellen aller Listen und Properties
 
 		caveEntryProps = GWT.create(CaveEntryProperties.class);
 		styleProps = GWT.create(StyleProperties.class);
@@ -380,7 +380,7 @@ public void onClick(ClickEvent event) {
 		};
 		edit.addHandler(editWallsClickHandler, ClickEvent.getType());
 
-		ToolButton delete = new ToolButton(new IconConfig("cancelButton", "cancelButtonOver"));
+		ToolButton delete = new ToolButton(new IconConfig("closeButton", "closeButtonOver"));
 		delete.setToolTip(Util.createToolTip("Delete Wall", "Select a wall, then click here."));
 
 		header.addTool(addWalls);
@@ -515,7 +515,7 @@ public void onClick(ClickEvent event) {
 
 		tabPanel.add(icoSelector, "Pictorial Elements");
 
-		ToolButton cancelTB = new ToolButton(new IconConfig("cancelButton", "cancelButtonOver"));
+		ToolButton cancelTB = new ToolButton(new IconConfig("closeButton", "closeButtonOver"));
 		cancelTB.setToolTip(Util.createToolTip("close"));
 		cancelTB.addSelectHandler(new SelectHandler() {
 
@@ -583,7 +583,7 @@ public void onSelect(SelectEvent event) {
 		return mainPanel;
 	}
 
-	//Interfaces für ComboBoxen und ListViews
+	//Interfaces fuer ComboBoxen und ListViews
 	interface CaveEntryProperties extends PropertyAccess<CaveEntry> {
 		ModelKeyProvider<CaveEntry> caveID();