Skip to content

Commit

Permalink
Merge pull request #542 from cmv/fix/clean-up-draw-widget-html-css
Browse files Browse the repository at this point in the history 
remove unused css and html from Draw widget.
  • Loading branch information
@DavidSpriggs
DavidSpriggs committed Apr 19, 2016
2 parents e854509 + df3f889 commit fc53a9f
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 167 deletions.
76 changes: 4 additions & 72 deletions viewer/js/gis/dijit/Draw/css/Draw.css
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
.gis_DrawDijit {
}

.gis_DrawDijit .outerList>li {
margin-bottom: 1em;
}
.gis_DrawDijit .list-unstyled {
padding-left: 0px;
padding-left: 0;
list-style-type: none;
list-style-position: outside;
list-style-image: none;
}

.gis_DrawDijit .list-inline {
padding-left: 0px;
padding-left: 0;
margin-left: -5px;
list-style-type: none;
list-style-position: outside;
Expand All @@ -23,75 +20,10 @@
display: inline-block;
}

.gis_DrawDijit .drawButton {
width: 50px;
}

.gis_DrawDijit .stopIcon {
color: red;
}

.gis_DrawDijit .drawButton .dijitButtonText {
/*display: none;*/
}
.gis_DrawDijit .polyIcon {
background-image: url(../images/toolbar_icons.png);
background-position: -68px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .pointIcon {
background-image: url(../images/toolbar_icons.png);
background-position: 0px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .circleDrawIcon {
background-image: url(../images/toolbar_icons.png);
background-position: -390px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .lineIcon {
background-image: url(../images/toolbar_icons.png);
background-position: -34px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .freehandDrawIcon {
background-image: url(../images/toolbar_icons.png);
background-position: -102px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .freehandPolygonDrawIcon {
background-image: url(../images/toolbar_icons_2.png);
background-position: -473px 0;
width: 16px;
height: 16px;
}

.gis_DrawDijit .clearIcon {
background-image: url(../images/clear.png);
width: 16px;
height: 16px;
}

.gis_DrawDijit .formContainer {
/*border: 1px solid #bbb;*/
margin-bottom: -1px;
width: 100%;
}

.gis_DrawDijit .buttonActionBar {
/*background-color: #F2F2F2;
border: 1px solid #CDCDCD;*/
padding: 3px 0px 2px 0px;
text-align: right;
width: 100%;
.gis_DrawDijit .dijitButtonNode .dijitIcon {
margin-right: 0;
}
175 changes: 80 additions & 95 deletions viewer/js/gis/dijit/Draw/templates/Draw.html
View file
Original file line number Diff line number Diff line change
@@ -1,100 +1,85 @@
<div class="gis_DrawDijit">
<div class="formContainer">
<div style="padding:5px;">
<ul class="list-unstyled outerList">
<ul class="list-unstyled outerList">
<li>
<ul class="list-inline list-unstyled">
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-point fa fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawPoint"
class="drawButton"
title="${i18n.labels.point}">
${i18n.labels.point}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-circle fa fa-fw',showLabel:false,drawType:'CIRCLE'"
data-dojo-attach-event="onClick:drawCircle"
class="drawButton"
title="${i18n.labels.circle}">
${i18n.labels.circle}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polyline fa fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawLine"
class="drawButton"
title="${i18n.labels.polyline}">
${i18n.labels.polyline}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polyline fa fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandLine"
class="drawButton"
title="${i18n.labels.freehandPolyline}">
${i18n.labels.freehandPolyline}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polygon fa fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawPolygon"
class="drawButton"
title="${i18n.labels.polygon}">
${i18n.labels.polygon}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polygon fa fa-fw',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandPolygon"
class="drawButton"
title="${i18n.labels.freehandPolygon}">
${i18n.labels.freehandPolygon}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="stopDrawingButton"
data-dojo-props="iconClass:'fa fa-stop fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:stopDrawing"
class="drawButton"
title="${i18n.labels.stopDrawing}">
${i18n.labels.stopDrawing}
</button>
</li>
<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="eraseDrawingButton"
data-dojo-props="iconClass:'fa fa-history fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:clearGraphics"
class="drawButton"
title="${i18n.labels.clearDrawing}">
${i18n.labels.clearDrawing}
</button>
</li>
</ul>
</li>
<li>
<div class="drawModeIndicatorNode">
<span style="font-weight: bold">${i18n.labels.currentDrawMode}</span>
<span data-dojo-attach-point="drawModeTextNode">${i18n.labels.currentDrawModeNone}</span>
</div>
</li>

<li>
<ul class="list-inline list-unstyled">

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-point',showLabel:false"
data-dojo-attach-event="onClick:drawPoint"
class="drawButton"
title="${i18n.labels.point}">
${i18n.labels.point}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-circle',showLabel:false,drawType:'CIRCLE'"
data-dojo-attach-event="onClick:drawCircle"
class="drawButton"
title="${i18n.labels.circle}">
${i18n.labels.circle}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polyline',showLabel:false"
data-dojo-attach-event="onClick:drawLine"
class="drawButton"
title="${i18n.labels.polyline}">
${i18n.labels.polyline}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polyline',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandLine"
class="drawButton"
title="${i18n.labels.freehandPolyline}">
${i18n.labels.freehandPolyline}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-polygon',showLabel:false"
data-dojo-attach-event="onClick:drawPolygon"
class="drawButton"
title="${i18n.labels.polygon}">
${i18n.labels.polygon}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button" data-dojo-props="iconClass:'adw-icon-freehand-polygon',showLabel:false"
data-dojo-attach-event="onClick:drawFreehandPolygon"
class="drawButton"
title="${i18n.labels.freehandPolygon}">
${i18n.labels.freehandPolygon}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="stopDrawingButton"
data-dojo-props="iconClass:'fa fa-stop fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:stopDrawing"
class="drawButton"
title="${i18n.labels.stopDrawing}">
${i18n.labels.stopDrawing}
</button>
</li>

<li>
<button data-dojo-type="dijit/form/Button"
data-dojo-attach-point="eraseDrawingButton"
data-dojo-props="iconClass:'fa fa-history fa-fw',showLabel:false,disabled:true"
data-dojo-attach-event="onClick:clearGraphics"
class="drawButton"
title="${i18n.labels.clearDrawing}">
${i18n.labels.clearDrawing}
</button>
</li>

</ul>
</li>

<li>
<div class="drawModeIndicatorNode">
<span style="font-weight: bold">${i18n.labels.currentDrawMode}</span>
<span data-dojo-attach-point="drawModeTextNode">${i18n.labels.currentDrawModeNone}</span>
</div>
</li>

</ul>

</div>
</ul>
</div>

</div>

0 comments on commit fc53a9f

Please sign in to comment.