Skip to content

Commit

Permalink
Merge pull request #5 from magis-nc/v1.3.3
Browse files Browse the repository at this point in the history 
V1.3.3
  • Loading branch information
@jcornet
jcornet committed Oct 21, 2015
2 parents 27670b4 + 2fea3db commit 5a44336
Show file tree
Hide file tree
Showing 13 changed files with 939 additions and 292 deletions.
84 changes: 32 additions & 52 deletions Widget.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<img title="${nls.addDrawTitle}" data-dojo-attach-point="menuAddButton" class="menu-item-active" src="${folderUrl}images/add.png" data-dojo-attach-event="ondijitclick:menuOnClickAdd" />
<img title="${nls.editDrawTitle}" data-dojo-attach-point="menuEditButton" class="menu-item-active hidden" src="${folderUrl}images/edit.png" />
<img title="${nls.listDrawTitle}" data-dojo-attach-point="menuListButton" class="menu-item" src="${folderUrl}images/list.png" data-dojo-attach-event="ondijitclick:menuOnClickList" />
<img title="${nls.importExportTitle}" data-dojo-attach-point="menuListImportExport" class="menu-item" src="${folderUrl}images/swap_vert.png" data-dojo-attach-event="ondijitclick:menuOnClickImportExport" />
</div>
<span class="hide-box">
${nls.hideOption}
Expand All @@ -17,34 +16,22 @@ <h2>${nls.addDrawTitle}</h2>
<div class="bloc">
<label>${nls.selectDrawMode}</label>
<div data-dojo-attach-point="drawBox" data-dojo-type="jimu/dijit/DrawBox" data-dojo-props='types:["point","polyline","polygon","text"],showClear:false' style="margin-top:5px;"></div>

<div data-dojo-attach-point="measureSection" class="measure-section">
<div style="margin-bottom:7px;">
<input data-dojo-attach-point="showMeasure" type="checkbox" />
<label data-dojo-attach-point="showMeasureLabel">${nls.showMeasurements}</label>
</div>
<div data-dojo-attach-point="areaMeasure" style="display:none;height:30px;margin-bottom:7px;">
<div class="area-units-tip jimu-float-leading">${nls.areaUnits}</div>
<select data-dojo-attach-point="areaUnitSelect" data-dojo-type="dijit/form/Select" class=" jimu-float-trailing" style="width:50%;height:30px;"></select>
</div>
<div data-dojo-attach-point="distanceMeasure" style="display:none;height:30px;">
<div class="distance-units-tip jimu-float-leading">${nls.distanceUnits}</div>
<select data-dojo-attach-point="distanceUnitSelect" data-dojo-type="dijit/form/Select" class=" jimu-float-trailing" style="width:50%;height:30px;"></select>
</div>
</div>
</div>
</div>

<div data-dojo-attach-point="editorSection">
<h2 data-dojo-attach-point="editorTitle">${nls.addDrawTitle}</h2>
<div class="content">
<label>${nls.nameField}:</label>
<br />
<input id="nameField" type="text" data-dojo-attach-point="nameField" value="${nls.nameFieldDefaultValue}" class="jimu-input" data-dojo-attach-event="onchange:editorUpdateTextPlus" />
<br />
<label>${nls.descriptionField}:</label>
<br />
<textarea id="descriptionField" data-dojo-attach-point="descriptionField" class="jimu-input" rows="3"></textarea>
<div data-dojo-attach-point="fieldsDiv">
<label>${nls.nameField}:</label>
<br />
<input id="nameField" type="text" data-dojo-attach-point="nameField" value="${nls.nameFieldDefaultValue}" class="jimu-input" data-dojo-attach-event="onchange:editorUpdateTextPlus" />
<br />
<label>${nls.descriptionField}:</label>
<br />
<textarea id="descriptionField" data-dojo-attach-point="descriptionField" class="jimu-input" rows="3"></textarea>
</div>
<span class="is-measure" data-dojo-attach-point="isMeasureSpan" style="display:none;"><hr />${nls.isMeasureMessage}</span>
<hr />
<div data-dojo-attach-point="editorSymbolChooserDiv" class="full-width"></div>
<table class="symbol-set-table" cellspading="0" data-dojo-attach-point="editorSymbolTextPlusNode">
Expand Down Expand Up @@ -96,8 +83,22 @@ <h2 data-dojo-attach-point="editorTitle">${nls.addDrawTitle}</h2>
</tr>
</tbody>
</table>

<br />
<hr />
<div data-dojo-attach-point="measureSection" class="measure-section">
<div style="margin-bottom:7px;">
<input data-dojo-attach-point="showMeasure" type="checkbox" />
<label data-dojo-attach-point="showMeasureLabel">${nls.showMeasurements}</label>
</div>
<div data-dojo-attach-point="areaMeasure" style="display:none;height:30px;margin-bottom:7px;">
<div class="area-units-tip jimu-float-leading">${nls.areaUnits}</div>
<select data-dojo-attach-point="areaUnitSelect" data-dojo-type="dijit/form/Select" class=" jimu-float-trailing" style="width:50%;height:30px;"></select>
</div>
<div data-dojo-attach-point="distanceMeasure" style="display:none;height:30px;">
<div class="distance-units-tip jimu-float-leading">${nls.distanceUnits}</div>
<select data-dojo-attach-point="distanceUnitSelect" data-dojo-type="dijit/form/Select" class=" jimu-float-trailing" style="width:50%;height:30px;"></select>
</div>
</div>
<hr />
<p class="editor-add-message" data-dojo-attach-point="editorAddMessage" style="display:none;">${nls.addMessage}.</p>
<p class="editor-add-message" data-dojo-attach-point="editorEditMessage" style="display:none;">${nls.editMessage}.</p>
<p class="editor-add-message" data-dojo-attach-point="editorSnappingMessage">${nls.snappingMessage}.</p>
Expand Down Expand Up @@ -130,41 +131,20 @@ <h2>${nls.listDrawTitle}</h2>
</table>
</div>
<div class="footer">
<div data-dojo-attach-point="allActionsNode">
<div class="list-draw-actions">
<div>
<div style="width: calc(100% - 35px);" class="list-draw-actions" data-dojo-attach-point="allActionsNode">
<!--<span class="text">${nls.all} :</span>-->
<span class="text"><input type="checkbox" data-dojo-attach-event="ondijitclick:listUpdateAllCheckbox" data-dojo-attach-point="listCheckboxAll2" /></span>
<span title="${nls.zoomAllLabel}" class="zoom blue-button" data-dojo-attach-event="ondijitclick:zoomAll">&nbsp;</span>
<a data-dojo-attach-point="exportSelectionButton" data-dojo-attach-event="ondijitclick:exportSelectionInFile">
<span title="${nls.copyLabel}" class="copy blue-button" data-dojo-attach-event="ondijitclick:copy">&nbsp;</span>
<span title="${nls.deleteAllLabel}" class="clear red-button" data-dojo-attach-event="ondijitclick:clear">&nbsp;</span>
<a data-dojo-attach-point="exportSelectionButton" data-dojo-attach-event="ondijitclick:exportSelectionInFile">
<span title="${nls.exportLabel}" class="export blue-button" >&nbsp;</span>
</a>
<span title="${nls.deleteAllLabel}" class="clear red-button" data-dojo-attach-event="ondijitclick:clear">&nbsp;</span>
</div>
<span title="${nls.importTitle}" class="import-button blue-button" data-dojo-attach-event="ondijitclick:launchImportFile">&nbsp;</span>
</div>
</div>
</div>

<div data-dojo-attach-point="importExportSection">
<h2>${nls.importExportTitle}</h2>
<table class="jimu-table">
<tr>
<td>
<h4 class="title">${nls.exportTitle}</h4>
<div class="list-draw-actions">
<a data-dojo-attach-point="exportButton" target="_BLANK" data-dojo-attach-event="ondijitclick:exportInFile" download="myDraw.json" href="#"><span class="export blue-button"></span></a>
</div>
</td>
</tr>
<tr>
<td>
<h4 class="title">${nls.importTitle}</h4>
<div class="draw-import list-draw-actions">
<input class="file" value="" type="file" data-dojo-attach-point="importFileInput" />
<a data-dojo-attach-point="importButton" data-dojo-attach-event="ondijitclick:importFile"><span class="import blue-button"></span></a>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
Loading

0 comments on commit 5a44336

Please sign in to comment.