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.

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

Feature/floating TitlePane widgets #117

Merged
merged 7 commits into from
Jul 14, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 10 additions & 27 deletions viewer/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,19 @@ body, html {
/*font-family: Tahoma;*/
font-size: 14px;
}

.appHeader {
background: url("../images/linen.jpg") repeat-x scroll left top transparent;
height: 70px;
margin: 0;
padding: 0;
width: 100%;
}

.appHeader .headerLogo {
float: left;
left: 30px;
position: relative;
top: 8px;
}

.appHeader .headerTitle {
color: #FFFFFF;
float: left;
Expand All @@ -32,33 +29,28 @@ body, html {
top: 15px;
position: relative;
}

.appHeader .subHeaderTitle {
color: #CFCFCF;
font-size: small;
padding-left: 20px;
}

.appHeader .search {
float: left;
left: 80px;
position: relative;
top: 18px;
}

.appHeader .headerLinks {
float: right;
color: #FFFFFF;
position: relative;
top: 27px;
right: 10px;
text-align:right;
text-align: right;
}

.appHeader .headerLinks a {
color: #FFFFFF;
}

#borderContainer {
position: absolute;
top: 70px;
Expand All @@ -67,7 +59,6 @@ body, html {
right: 0;
background-color: #FFFFFF
}

#sidebar {
width: 334px;
padding: 4px;
Expand All @@ -76,25 +67,20 @@ body, html {
overflow-x: hidden;
border-right: 1px solid #B5BCC7;
}

#map {
padding: 0;
overflow: hidden;
background: url("../images/noisy_grid.png") #fff;
}

.HomeButton, .LocateButton {
margin-bottom: 10px;
}

.titlePaneBottomFix {
margin-bottom: -1px;
}

.titlePaneRightFix {
margin-right: -1px;
}

.sidebarCollapseButton {
width: 16px;
height: 25px;
Expand All @@ -110,48 +96,45 @@ body, html {
background-repeat: no-repeat;
cursor: pointer;
}

.sidebarCollapseButton.close {
left: 342px;
background-image: url("../images/close.png");
}

.sidebarCollapseButton.open {
background-image: url("../images/open.png");
left: 0;
}

.floatingWidget_underlay {
display:none
display: none
}

#help_parent_underlay {
display:block;
display: block;
}

/* dbootstrap overrides*/

.dbootstrap .dijitToolbar .dijitButtonContents {
padding: 1px !important;
}

.dbootstrap .dijitTitlePane {
border: 1px solid #DDDDDD;
margin-bottom: 2px;
-webkit-border-radius: 4px;
border-radius: 4px;
}

.dbootstrap .dijitTitlePaneTitle {
color: #666666 !important;
border-bottom: none;
padding: 8px 15px;
background-color: #F5F5F5;
}

.dijitSliderBarContainerH{
z-index: 0!important;
.dijitSliderBarContainerH {
z-index: 0 !important;
}
.dbootstrap .dijitTitlePaneContentInner {
background-color: #FFFFFF;
}
/* end dbootstrap overrides*/
.dbootstrap :focus {
outline: none !important;
}
/* end dbootstrap overrides*/
1 change: 0 additions & 1 deletion viewer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Configurable Viewer</title>
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.10/js/dojo/dojo/resources/dojo.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.10/js/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="css/main.css">
</head>
Expand Down
5 changes: 5 additions & 0 deletions viewer/js/config/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ define([
include: true,
id: 'find',
type: 'titlePane',
canFloat: true,
path: 'gis/dijit/Find',
title: 'Find',
open: false,
Expand All @@ -216,6 +217,7 @@ define([
include: true,
id: 'draw',
type: 'titlePane',
canFloat: true,
path: 'gis/dijit/Draw',
title: 'Draw',
open: false,
Expand All @@ -229,6 +231,7 @@ define([
include: true,
id: 'measurement',
type: 'titlePane',
canFloat: true,
path: 'gis/dijit/Measurement',
title: 'Measurement',
open: false,
Expand All @@ -244,6 +247,7 @@ define([
include: true,
id: 'print',
type: 'titlePane',
canFloat: true,
path: 'gis/dijit/Print',
title: 'Print',
open: false,
Expand Down Expand Up @@ -308,6 +312,7 @@ define([
include: true,
id: 'streetview',
type: 'titlePane',
canFloat: true,
position: 9,
path: 'gis/dijit/StreetView',
title: 'Google Street View',
Expand Down
118 changes: 118 additions & 0 deletions viewer/js/gis/dijit/FloatingTitlePane.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
define([
'dojo/_base/declare',
'dijit/TitlePane',
'dijit/_Contained',
'dojo/on',
'dojo/_base/lang',
'dojo/dnd/Moveable',
'dojo/aspect',
'dojo/_base/window',
'dojo/window',
'dojo/dom-geometry',
'dojo/dom-style',
'dojo/dom-construct',
'dojo/dom-attr',
'dojo/dom-class',
'xstyle/css!./FloatingTitlePane/css/FloatingTitlePane.css'
], function(declare, TitlePane, _Contained, on, lang, Moveable, aspect, win, winUtils, domGeom, domStyle, domConstruct, domAttr, domClass, css) {
return declare([TitlePane, _Contained], {
postCreate: function() {
if (this.canFloat) {
this.dockHandleNode = domConstruct.create('span', {
title: 'Dock widget'
}, this.titleNode, 'after');
domStyle.set(this.dockHandleNode, 'display', 'none');
domClass.add(this.dockHandleNode, 'floatingWidgetDock');

this.moveHandleNode = domConstruct.create('span', {
title: 'Move widget'
}, this.titleNode, 'after');
domClass.add(this.moveHandleNode, 'floatingWidgetPopout');

on(this.moveHandleNode, 'click', lang.hitch(this, function(evt) {
this._undockWidget();
evt.stopImmediatePropagation();
}));
on(this.dockHandleNode, 'click', lang.hitch(this, function(evt) {
this._dockWidget();
evt.stopImmediatePropagation();
}));
}
this.inherited(arguments);
},
startup: function() {
this.index = this.getIndexInParent();
if (this.titleBarNode && this.canFloat) {
this._moveable = new Moveable(this.domNode, {
handle: this.moveHandleNode
});
aspect.after(this._moveable, 'onMoveStop', lang.hitch(this, '_endDrag'), true);
aspect.after(this._moveable, 'onFirstMove', lang.hitch(this, '_moveDom'), true);
}
this.inherited(arguments);
},
_undockWidget: function() {
if (!this.isFloating) {
domClass.add(this.moveHandleNode, 'floatingWidgetMove');
domClass.remove(this.moveHandleNode, 'floatingWidgetPopout');
}
},
_dockWidget: function() {
domAttr.remove(this.domNode, 'style');
domStyle.set(this.dockHandleNode, 'display', 'none');
var dockedWidgets = this.sidebar.getChildren();
this.placeAt(this.sidebar, dockedWidgets.length);
domClass.remove(this.moveHandleNode, 'floatingWidgetMove');
domClass.add(this.moveHandleNode, 'floatingWidgetPopout');
this.isFloating = false;
},
_moveDom: function() {
if (!this.isFloating) {
domStyle.set(this.dockHandleNode, 'display', 'inline');
domStyle.set(this.domNode, 'z-index', '40');
domClass.add(this.moveHandleNode, 'floatingWidgetMove');
domClass.remove(this.moveHandleNode, 'floatingWidgetPopout');
var computedStyle = domStyle.getComputedStyle(this.containerNode);
var width = parseInt(domStyle.getComputedStyle(this.sidebar.containerNode).width, 10);
domGeom.setContentSize(this.containerNode, {
w: (width - 32)
}, computedStyle);
domGeom.setContentSize(this.titleBarNode, {
w: (width - 32)
}, computedStyle);
this.isFloating = true;
this.placeAt(win.body());
}
},
_endDrag: function() {
// summary:
// Called after dragging the Dialog. Saves the position of the dialog in the viewport,
// and also adjust position to be fully within the viewport, so user doesn't lose access to handle
var nodePosition = domGeom.position(this.domNode);
var viewport = winUtils.getBox(this.ownerDocument);
nodePosition.y = Math.min(Math.max(nodePosition.y, 0), (viewport.h - nodePosition.h));
nodePosition.x = Math.min(Math.max(nodePosition.x, 0), (viewport.w - nodePosition.w));
this._relativePosition = nodePosition;
this._position();
},
_position: function() {
// summary:
// Position the dialog in the viewport. If no relative offset
// in the viewport has been determined (by dragging, for instance),
// center the dialog. Otherwise, use the Dialog's stored relative offset,
// adjusted by the viewport's scroll.
if (!domClass.contains(this.ownerDocumentBody, 'dojoMove')) { // don't do anything if called during auto-scroll
var node = this.domNode,
viewport = winUtils.getBox(this.ownerDocument),
p = this._relativePosition,
bb = p ? null : domGeom.position(node),
l = Math.floor(viewport.l + (p ? p.x : (viewport.w - bb.w) / 2)),
t = Math.floor(viewport.t + (p ? p.y : (viewport.h - bb.h) / 2));
domStyle.set(node, {
left: l + 'px',
top: t + 'px'
});
}
}
});
});
16 changes: 16 additions & 0 deletions viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.floatingWidgetMove:before {
float: right;
margin-left: 10px;
content: "\f047";
font-family: FontAwesome;
}
.floatingWidgetDock:before {
float: right;
content: "\f112";
font-family: FontAwesome;
}
.floatingWidgetPopout:before {
float: right;
content: "\f064";
font-family: FontAwesome;
}
Loading