Skip to content

Commit

Permalink
Finish merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikvullings
erikvullings committed Aug 21, 2015
1 parent b6e9b46 commit cb06148
Show file tree
Hide file tree
Showing 2 changed files with 111 additions and 97 deletions.
204 changes: 107 additions & 97 deletions example/gh_pages/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,35 @@
<!--[if lt IE 9]>
<script>
alert("This application does not work on IE8 or below! Please obtain a newer browser, or try a portable version of Firefox.");
window.location = "https://github.com/TNOCS/csMap";
window.location = "https://github.com/TNOCS/csWeb";
</script>
<![endif]-->

<script type="text/javascript">
if (screen.width <= 719) {
document.location = "m.html";
}
</script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="initial-scale=1,user-scalable=no,maximum-scale=1,width=device-width">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="description" content="csMap, your mapping solution.">
<meta name="description" content="csWeb, your mapping solution.">
<meta name="author" content="Arnoud de Jong, Erik Vullings">
<meta name="color:Accent" content="#a98e2e" />

<!--TODO Add your title here-->
<title>csMap</title>
<title>csWeb</title>

<link rel="stylesheet" href="css/csMap.css">
<link rel="stylesheet" href="css/csWeb.css">
<link rel="shortcut icon" href="favicon.ico">
</head>

<body data-ng-controller="appCtrl" data-ng-cloak data-ng-init="showMap=true">
<script src="/socket.io/socket.io.js"></script>
<script src="csMap.js"></script>
<script src="csWeb.js"></script>
<script src="cs/js/cesium.js"></script>

<div role="navigation" class="navbar navbar-inverse navbar-fixed-top">
Expand All @@ -41,7 +48,7 @@

<!-- Link to views -->
<div class="navbar-collapse collapse">
<project-header-selection></project-header-selection>
<project-header-selection></project-header-selection>

<!-- Dashboard selection -->
<dashboard-header-selection></dashboard-header-selection>
Expand All @@ -65,107 +72,110 @@

<div style="position: absolute;width: 100%;height:100%;pointer-events: none;display:table">

<div ng-show="vm.$layerService.visual.leftPanelVisible" class="leftpanel leftpanel-entrance" ng-cloak style="pointer-events: all">
<div style="width:350px;height:100%;background:white">
<div class="col-xs-3 leftpanel-tab">
<!-- required for floating -->
<!-- Nav tabs -->
<ul class="nav nav-tabs tabs-left" id="leftPanelTab">
<!-- 'tabs-right' for right tabs -->
<li popover="{{'BASESTYLES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#basestyles" data-toggle="tab" data-ng-if="vm.$mapService.isIntermediate">
<div class="mapIcon"></div>
</a>
</li>
<li class="active" popover="{{'LAYERS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#layers" data-toggle="tab">
<div class="layersIcon"></div>
</a>
</li>
<li popover="{{'FILTERS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#filters" data-toggle="tab">
<div class="filtersIcon"></div>
</a>
</li>
<li popover="{{'STYLES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#styles" data-toggle="tab">
<div class="stylesIcon"></div>
</a>
</li>
<li popover="{{'MCA.NAME' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#mca" data-toggle="tab" data-ng-if="vm.$mapService.isExpert">
<div class="mcaIcon"></div>
</a>
</li>
<li popover="{{'HEATMAP.NAME' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#heatmap" data-toggle="tab" data-ng-if="vm.$mapService.isExpert">
<div class="heatmapIcon"></div>
</a>
</li>
<li popover="{{'FEATURES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#features" data-toggle="tab">
<div class="featuresIcon"></div>
<div ng-show="vm.$layerService.visual.leftPanelVisible" class="leftpanel leftpanel-entrance" ng-cloak style="pointer-events: all">
<div style="width:350px;height:100vh;background:white">
<!-- http://stackoverflow.com/questions/1575141/make-div-100-height-of-browser-window -->
<div class="col-xs-3 leftpanel-tab">
<!-- required for floating -->
<!-- Nav tabs -->
<ul class="nav nav-tabs tabs-left" id="leftPanelTab">
<!-- 'tabs-right' for right tabs -->
<li popover="{{'BASESTYLES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#basestyles" data-toggle="tab" data-ng-if="vm.$mapService.isIntermediate">
<div class="mapIcon"></div>
</a>
</li>
<li class="active" popover="{{'LAYERS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#layers" data-toggle="tab">
<div class="layersIcon"></div>
</a>
</li>
<li popover="{{'FILTERS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#filters" data-toggle="tab">
<div class="filtersIcon"></div>
</a>
</li>
<li popover="{{'STYLES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#styles" data-toggle="tab">
<div class="stylesIcon"></div>
</a>
</li>
<li popover="{{'MCA.NAME' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#mca" data-toggle="tab" data-ng-if="vm.$mapService.isExpert">
<div class="mcaIcon"></div>
</a>
</li>
<li popover="{{'HEATMAP.NAME' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#heatmap" data-toggle="tab" data-ng-if="vm.$mapService.isExpert">
<div class="heatmapIcon"></div>
</a>
</li>
<li popover="{{'FEATURES' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#features" data-toggle="tab">
<div class="featuresIcon"></div>
</a>
</li>
<li popover="{{'LEGEND' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#legend" data-toggle="tab">
<div class="mainLegendIcon"></div>
</a>
</li>
<li popover="{{'DASHBOARD_SELECTION' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#dashboardselection" data-ng-if="vm.$mapService.isExpert" data-toggle="tab"><i class="fa fa-tachometer fa-2x" style="color: black"></i>
</a>
</li>
<li popover="{{'LEGEND' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#legend" data-toggle="tab">
<div class="mainLegendIcon"></div>
</a>
</li>
<li popover="{{'DASHBOARD_SELECTION' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#dashboardselection" data-ng-if="vm.$mapService.isExpert" data-toggle="tab"><i class="fa fa-tachometer fa-2x" style="color: black"></i>
</a>
</li>
<li popover="{{'SETTINGS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#settings" data-toggle="tab" data-ng-if="vm.$mapService.isAdminExpert">
<i class="fa fa-gear fa-2x" style="color: black"></i>
</a>
</li>
</ul>
</div>

<div class="col-xs-9 leftpanel-content">
<!-- Tab panes -->
<div class="tab-content ">
<base-map-list class="tab-pane" id="basestyles"></base-map-list>
</li>
<li popover="{{'SETTINGS' | translate}}" popover-popup-delay=750 popover-placement="right" popover-trigger="mouseenter" popover-append-to-body="true">
<a href="#settings" data-toggle="tab" data-ng-if="vm.$mapService.isAdminExpert">
<i class="fa fa-gear fa-2x" style="color: black"></i>
</a>
</li>
</ul>
</div>

<layers-directive class="tab-pane active" id="layers"></layers-directive>
<div class="col-xs-9 leftpanel-content">
<!-- Tab panes -->
<div class="tab-content ">
<base-map-list class="tab-pane" id="basestyles"></base-map-list>

<filter-list class="tab-pane" id="filters"></filter-list>
<layers-directive class="tab-pane active" id="layers"></layers-directive>

<style-list class="tab-pane" id="styles"></style-list>
<filter-list class="tab-pane" id="filters"></filter-list>

<mca class="tab-pane" id="mca"></mca>
<style-list class="tab-pane" id="styles"></style-list>

<heatmap class="tab-pane" id="heatmap"></heatmap>
<mca class="tab-pane" id="mca"></mca>

<feature-list class="tab-pane" id="features"></feature-list>
<heatmap class="tab-pane" id="heatmap"></heatmap>

<legend-list class="tab-pane" id="legend"></legend-list>
<feature-list class="tab-pane" id="features"></feature-list>

<dashboard-selection class="tab-pane" id="dashboardselection"></dashboard-selection>
<legend-list class="tab-pane" id="legend"></legend-list>

<project-settings class="tab-pane" id="settings"></project-settings>
</div>
</div>
</div>
</div>
<dashboardirective container="main" style="display:table-cell;width:100%;vertical-align: top;" dashboard="vm.$dashboardService.mainDashboard"></dashboardirective> <!-- class="dashboard-directive" -->
<dashboard-selection class="tab-pane" id="dashboardselection"></dashboard-selection>

<div class="rightpanel" style="position:absolute">
<div id="rightpanelTabContainer" class="tabbable tabs-left" style="display:table; height:100%; padding:0px;">
<!-- Nav tabs -->
<ul id="rightpanelTabs" class="nav nav-tabs" style="margin-right:0px; width:50px; height:100%; display:table-cell">
<li style="margin-top:10px" ng-style="!vm.$layerService.visual.rightPanelVisible && {'opacity':0}" ng-click="vm.$layerService.visual.rightPanelVisible = false" popover="{{'HIDE_PANEL' | translate}}" popover-placement="left" popover-trigger="mouseenter" popover-append-to-body="true">
<a class="rightpanel-hidetab">
<span class="fa fa-2x fa-chevron-right"></span>
</a>
</li>
</ul>
<div id="rightpanelTabPanes" ng-show="vm.$layerService.visual.rightPanelVisible" class="tab-content" style="display: table-cell; vertical-align:top; width:100%; height:100%; background-color: white;">
</div>
</div>
</div>
<project-settings class="tab-pane" id="settings"></project-settings>
</div>
</div>
</div>
</div>
<dashboardirective container="main" style="display:table-cell;width:100%;vertical-align: top;" dashboard="vm.$dashboardService.mainDashboard"></dashboardirective>
<!-- class="dashboard-directive" -->

<div class="rightpanel" style="position:absolute">
<div id="rightpanelTabContainer" class="tabbable tabs-left" style="display:table; height:100%; padding:0px;">
<!-- Nav tabs -->
<ul id="rightpanelTabs" class="nav nav-tabs" style="margin-right:0px; width:50px; height:100%; display:table-cell">
<li style="margin-top:10px" ng-style="!vm.$layerService.visual.rightPanelVisible && {'opacity':0}" ng-click="vm.$layerService.visual.rightPanelVisible = false" popover="{{'HIDE_PANEL' | translate}}" popover-placement="left" popover-trigger="mouseenter"
popover-append-to-body="true">
<a class="rightpanel-hidetab">
<span class="fa fa-2x fa-chevron-right"></span>
</a>
</li>
</ul>
<div id="rightpanelTabPanes" ng-show="vm.$layerService.visual.rightPanelVisible" class="tab-content" style="display: table-cell; vertical-align:top; width:100%; height:100%; background-color: white;">
</div>
</div>
</div>

<!-- Right menu items -->
<!-- <script>
Expand Down Expand Up @@ -194,7 +204,7 @@
}
});
</script> -->
</div>
</div>

<!--Loading spinner-->
<div data-ng-show="layersLoading>0" id="loadingspinner" style="margin:0px auto; width:200px; height:100px;">
Expand Down
4 changes: 4 additions & 0 deletions example/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,15 @@
"./ServerComponents/helpers/Rss.d.ts",
"./ServerComponents/helpers/RssGeoJSON.d.ts",
"./ServerComponents/helpers/Utils.d.ts",
"./ServerComponents/import/AggregateOpportunitiesToGeoJsonTransformer.d.ts",
"./ServerComponents/import/AggregateOpportunitiesToOrganisationTransformer.d.ts",
"./ServerComponents/import/BagDetailsTransformer.d.ts",
"./ServerComponents/import/BaseTransformer.d.ts",
"./ServerComponents/import/BushalteAggregateTransformer.d.ts",
"./ServerComponents/import/CollateStreamTransformer.d.ts",
"./ServerComponents/import/CsvToJsonTransformer.d.ts",
"./ServerComponents/import/FieldFilterTransformer.d.ts",
"./ServerComponents/import/FieldSplitTransformer.d.ts",
"./ServerComponents/import/GeoJsonAggregateTransformer.d.ts",
"./ServerComponents/import/GeoJsonFeaturesTransformer.d.ts",
"./ServerComponents/import/GeoJsonOutputTransformer.d.ts",
Expand All @@ -90,6 +93,7 @@
"./ServerComponents/import/Importer.d.ts",
"./ServerComponents/import/ImporterRepositoryService.d.ts",
"./ServerComponents/import/KvKToJsonTransformer.d.ts",
"./ServerComponents/import/MergeGeoJsonTransformer.d.ts",
"./ServerComponents/import/RepeatEnum.d.ts",
"./ServerComponents/import/SplitAdresTransformer.d.ts",
"./ServerComponents/import/Store.d.ts",
Expand Down

0 comments on commit cb06148

Please sign in to comment.