Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'trial/notifications' into develop

Browse Source 
Conflicts:
	WebContent/main.html
This commit is contained in:
DennisSchiefer
2012-07-05 14:02:37 +01:00
parent 8b17e4864e 5e24749826
commit 517f321ccc
13 changed files with 226 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/main.html
+22 -7
View File
@@ -64,6 +64,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
<script src="gui/OSRM.GUIBoxHandle.js" type="text/javascript"></script>
<script src="gui/OSRM.Selector.js" type="text/javascript"></script>
<script src="gui/OSRM.MainGUI.js" type="text/javascript"></script>
<script src="gui/OSRM.Notifications.js" type="text/javascript"></script>
<script src="routing/OSRM.Routing.js" type="text/javascript"></script>
<script src="routing/OSRM.RoutingAlternatives.js" type="text/javascript"></script>
<script src="routing/OSRM.RoutingDescription.js" type="text/javascript"></script>
@@ -87,20 +88,34 @@ or see http://www.gnu.org/licenses/agpl.txt.
<!-- map -->
<div id="map"></div>
<!-- notification -->
<div id="notification-blanket">
<div id="notification-wrapper" class="box-wrapper">
<div id="notification-content" class="box-content">
<!-- exclusive notification -->
<div id="exclusive-notification-blanket">
<div id="exclusive-notification-wrapper" class="box-wrapper not-selectable">
<div id="exclusive-notification-content" class="box-content">
<!-- header -->
<div id="notification-toggle" class="iconic-button cancel-marker top-right-button"></div>
<div id="notification-label" class="box-label">Notification</div>
<div id="exclusive-notification-toggle" class="iconic-button cancel-marker top-right-button"></div>
<div id="exclusive-notification-label" class="box-label">Notification</div>
<!-- notification text -->
<div id="notification-box"></div>
<div id="exclusive-notification-box"></div>
</div>
</div>
</div>
<!-- tooltip notification -->
<div id="tooltip-notification-wrapper" class="box-wrapper not-selectable">
<div id="tooltip-notification-content" class="box-content">
<!-- header -->
<div id="tooltip-notification-toggle" class="iconic-button cancel-marker top-right-button"></div>
<div class="quad top-right-button"></div>
<div id="tooltip-notification-resize" class="iconic-button cancel-marker top-right-button"></div>
<div id="tooltip-notification-label" class="box-label">Notification</div>
<!-- notification text -->
<div id="tooltip-notification-box"></div>
</div>
</div>
<!-- config gui -->
<div id="config-wrapper" class="box-wrapper">
<div id="config-content" class="box-content">