Skip to content

Commit

Permalink
[DESIGN]: Remove truncate from viz form text, remove additional wrapp…
Browse files Browse the repository at this point in the history 
…er (#14311)

* remove truncate from viz form text, remove additional wrapper

* fix section paneling within viz

* remove redundant titling
  • Loading branch information
@snide
snide committed Oct 5, 2017
1 parent 7723520 commit 330665b
Show file tree
Hide file tree
Showing 11 changed files with 228 additions and 224 deletions.
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html
View file
@@ -1,4 +1,4 @@
<div>
<div class="kuiSideBarSection">
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="gaugeType">
Gauge Type
Expand Down
4 changes: 4 additions & 0 deletions src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html
View file
Expand Up @@ -36,6 +36,9 @@
></select>
</div>
</div>
</div>

<div class="kuiSideBarSection">

<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Expand All @@ -44,4 +47,5 @@
</div>

<heatmap-options></heatmap-options>

</div>
5 changes: 2 additions & 3 deletions src/core_plugins/kbn_vislib_vis_types/public/editors/pie.html
View file
@@ -1,9 +1,8 @@
<!-- vis type specific options -->
<div>
<div class="kuiSideBarSection">
<label>
<input type="checkbox" value="{{isDonut}}" ng-model="vis.params.isDonut" name="isDonut" ng-checked="vis.params.isDonut">
Donut
</label>
<vislib-basic-options></vislib-basic-options>
</div>
<vislib-basic-options></vislib-basic-options>

3 changes: 0 additions & 3 deletions src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
View file
Expand Up @@ -139,9 +139,6 @@

label {
flex: 2 0 0;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-bottom: 0;
font-size: 12px;
}
Expand Down
38 changes: 20 additions & 18 deletions src/core_plugins/markdown_vis/public/markdown_vis_params.html
View file
@@ -1,21 +1,23 @@
<div class="markdown-vis-options form-group">
<div>
<label for="markdownVisInput">Markdown</label>
<small class="pull-right"><a target="_window" href="https://help.github.com/articles/github-flavored-markdown/">Help <i aria-hidden="true" class="fa fa-link"></i></a></small>
</div>
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="markdownVisFontSize">
Font Size (<span ng-bind="vis.params.fontSize"></span>pt)
</label>
<div class="kuiSideBarFormRow__control">
<input id="markdownVisFontSize" type="range" ng-model="vis.params.fontSize" class="form-control" min="8" max="36" />
<div class="kuiSideBarSection">
<div class="markdown-vis-options form-group">
<div>
<label for="markdownVisInput">Markdown</label>
<small class="pull-right"><a target="_window" href="https://help.github.com/articles/github-flavored-markdown/">Help <i aria-hidden="true" class="fa fa-link"></i></a></small>
</div>
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="markdownVisFontSize">
Font Size (<span ng-bind="vis.params.fontSize"></span>pt)
</label>
<div class="kuiSideBarFormRow__control">
<input id="markdownVisFontSize" type="range" ng-model="vis.params.fontSize" class="form-control" min="8" max="36" />
</div>
</div>
<textarea
id="markdownVisInput"
ng-model="vis.params.markdown"
class="form-control"
rows="20"
data-test-subj="markdownTextarea"
></textarea>
</div>
<textarea
id="markdownVisInput"
ng-model="vis.params.markdown"
class="form-control"
rows="20"
data-test-subj="markdownTextarea"
></textarea>
</div>
78 changes: 37 additions & 41 deletions src/core_plugins/region_map/public/region_map_vis_params.html
View file
@@ -1,45 +1,46 @@
<div class="form-group">

<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Layer Settings
<div class="kuiSideBarSection">
<div class="form-group">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Layer Settings
</div>
</div>
</div>

<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="regionMap">
Vector map
</label>
<div class="kuiSideBarFormRow__control">
<select
id="regionMap"
class="kuiSelect kuiSideBarSelect"
ng-model="vis.params.selectedLayer"
ng-options="layer.name for layer in collections.vectorLayers track by layer.url"
ng-change="onLayerChange()"
></select>
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="regionMap">
Vector map
</label>
<div class="kuiSideBarFormRow__control">
<select
id="regionMap"
class="kuiSelect kuiSideBarSelect"
ng-model="vis.params.selectedLayer"
ng-options="layer.name for layer in collections.vectorLayers track by layer.url"
ng-change="onLayerChange()"
></select>
</div>
</div>
</div>

<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="joinField">
Join field
</label>
<div class="kuiSideBarFormRow__control">
<select id="joinField"
ng-model="vis.params.selectedJoinField"
ng-options="field.description for field in vis.params.selectedLayer.fields track by field.name"
>
<option value=''>Select</option></select>
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="joinField">
Join field
</label>
<div class="kuiSideBarFormRow__control">
<select id="joinField"
class="kuiSelect kuiSideBarSelect"
ng-model="vis.params.selectedJoinField"
ng-options="field.description for field in vis.params.selectedLayer.fields track by field.name"
>
<option value=''>Select</option></select>
</div>
</div>
</div>
</div>

<div class="kuiSideBarSection">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Style Settings
</div>
<div class="kuiSideBarSectionTitle__text">Style settings</div>
</div>

<div class="kuiSideBarFormRow" >
<label class="kuiSideBarFormRow__label" for="colorSchema">
Color Schema
Expand All @@ -53,16 +54,11 @@
></select>
</div>
</div>
</div>


<div class="kuiSideBarSection">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Basic Settings
</div>
<div class="kuiSideBarSectionTitle__text">Basic settings</div>
</div>


<vislib-basic-options></vislib-basic-options>


</div>
73 changes: 38 additions & 35 deletions src/core_plugins/table_vis/public/table_vis_params.html
View file
@@ -1,41 +1,44 @@
<div class="form-group">
<label for="datatableVisualizationPerPage">Per Page</label>
<input type="number" ng-model="vis.params.perPage" class="form-control" id="datatableVisualizationPerPage">
</div>

<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showMeticsAtAllLevels">
Show metrics for every bucket/level
</label>
</div>
<div class="kuiSideBarSection">
<div class="form-group">
<label for="datatableVisualizationPerPage">Per Page</label>
<input type="number" ng-model="vis.params.perPage" class="form-control" id="datatableVisualizationPerPage">
</div>

<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showPartialRows">
Show partial rows
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showMeticsAtAllLevels">
Show metrics for every bucket/level
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" ng-model="metricsAtAllLevels" disabled>
Calculate metrics for every bucket/level
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showPartialRows">
Show partial rows
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showTotal">
Show total
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="metricsAtAllLevels" disabled>
Calculate metrics for every bucket/level
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" ng-model="vis.params.showTotal">
Show total
</label>
</div>

<div>
<label for="datatableVisualizationTotalFunction">Total function</label>
<select ng-disabled="!vis.params.showTotal"
class="form-control"
ng-model="vis.params.totalFunc"
ng-options="x for x in totalAggregations" id="datatableVisualizationTotalFunction">
</select>
<div>
<label for="datatableVisualizationTotalFunction">Total function</label>
<select ng-disabled="!vis.params.showTotal"
class="form-control"
ng-model="vis.params.totalFunc"
ng-options="x for x in totalAggregations" id="datatableVisualizationTotalFunction">
</select>
</div>
</div>
38 changes: 20 additions & 18 deletions src/core_plugins/tagcloud/public/tag_cloud_vis_params.html
View file
@@ -1,21 +1,23 @@
<div class="form-group">
<div class="kuiSideBarSection">
<div class="form-group">
<label>Text Scale</label>
<select class="form-control" ng-model="vis.params.scale" ng-options="mode for mode in config.collections.scales"></select>
</div>
<div class="form-group">
<label>Orientations</label>
<select class="form-control" ng-model="vis.params.orientation" ng-options="mode for mode in config.collections.orientations"></select>
</div>
<div class="form-group">
<label>Font Size</label>
<div class="tag-cloud-fontsize-slider"></div>
</div>
<div>
<label>
<input type="checkbox" value="{{hideLabel}}" ng-model="vis.params.hideLabel" name="hideLabel"
ng-checked="vis.params.hideLabel">
Show Label
</label>
<div class="form-group">
<label>Text Scale</label>
<select class="form-control" ng-model="vis.params.scale" ng-options="mode for mode in config.collections.scales"></select>
</div>
<div class="form-group">
<label>Orientations</label>
<select class="form-control" ng-model="vis.params.orientation" ng-options="mode for mode in config.collections.orientations"></select>
</div>
<div class="form-group">
<label>Font Size</label>
<div class="tag-cloud-fontsize-slider"></div>
</div>
<div>
<label>
<input type="checkbox" value="{{hideLabel}}" ng-model="vis.params.hideLabel" name="hideLabel"
ng-checked="vis.params.hideLabel">
Show Label
</label>
</div>
</div>
</div>

0 comments on commit 330665b

Please sign in to comment.