Skip to content

W
web-apps
Commit c90ffcc7 authored by Alexander Yuzhin's avatar Alexander Yuzhin
Browse files
Options

[SE mobile] Add vertical axis handlers of charts

parent 87d6c74c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 550 additions and 24 deletions
apps/common/mobile/resources/less/ios/_listview.less
View file @ c90ffcc7
...@@ -22,6 +22,18 @@ ...@@ -22,6 +22,18 @@
margin-left: 10px; margin-left: 10px;
text-align: right; text-align: right;
} }
input.field {
color: @themeColor;
&::-webkit-input-placeholder {
color: @themeColor;
}
&.right {
text-align: right;
}
}
} }
&.buttons { &.buttons {
......
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
View file @ c90ffcc7
...@@ -115,6 +115,10 @@ define([ ...@@ -115,6 +115,10 @@ define([
}, },
initEvents: function () { initEvents: function () {
if ($('#edit-cell').length < 1) {
return;
}
var me = this; var me = this;
$('#font-bold').single('click', _.bind(me.onBold, me)); $('#font-bold').single('click', _.bind(me.onBold, me));
......
apps/spreadsheeteditor/mobile/app/template/EditChart.template
View file @ c90ffcc7
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</a> </a>
</li> </li>
<li> <li>
<a id="chart-vaxis" class="item-link"> <a id="chart-vaxis" class="item-link" data-page="#edit-chart-vertical-axis">
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Vertical Axis</div> <div class="item-title">Vertical Axis</div>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</a> </a>
</li> </li>
<li> <li>
<a id="chart-haxis" class="item-link"> <a id="chart-haxis" class="item-link" data-page="#edit-chart-horizontal-axis">
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">Horizontal Axis</div> <div class="item-title">Horizontal Axis</div>
...@@ -363,4 +363,170 @@ ...@@ -363,4 +363,170 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- Vertical Axis view -->
<div id="edit-chart-vertical-axis">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding" id="edit-chart-vertical-axis-title">Vertical Axis</div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div>
</div>
<div class="pages">
<div class="page" data-page="edit-chart-vertical-axis">
<div class="page-content">
<div class="content-block-title">Axis Options</div>
<div class="list-block">
<ul>
<li id="edit-vertical-axis-min-val">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Minimum Value</div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="number" placeholder="Auto">
</div>
</div>
</div>
</div>
</li>
<li id="edit-vertical-axis-max-val">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Maximum Value</div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="number" placeholder="Auto">
</div>
</div>
</div>
</div>
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a id="vertical-axis-cross" class="item-link smart-select" data-back-on-select="true">
<select name="vertical-axis-cross"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Axis Crosses</div>
<div class="item-after">Auto</div>
</div>
</div>
</a>
</li>
<li id="edit-vertical-axis-cross-value" style="display: none;">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Crosses Value</div>
<div class="item-after">
<div class="item-input">
<input class="field right" type="number" placeholder="0">
</div>
</div>
</div>
</div>
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a id="vertical-axis-display-units" class="item-link smart-select" data-back-on-select="true">
<select name="vertical-axis-display-units">
</select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Display Units</div>
<div class="item-after">None</div>
</div>
</div>
</a>
</li>
<li id="vertical-axis-in-reverse">
<div class="item-content">
<div class="item-inner">
<div class="item-title">Values in Reverse Order</div>
<div class="item-after">
<label class="label-switch">
<input type="checkbox">
<div class="checkbox"></div>
</label>
</div>
</div>
</div>
</li>
</ul>
</div>
<div class="content-block-title">Tick Options</div>
<div class="list-block">
<ul>
<li>
<a id="vertical-axis-tick-major" class="item-link smart-select" data-back-on-select="true">
<select name="vertical-axis-tick-major"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Major Type</div>
<div class="item-after">None</div>
</div>
</div>
</a>
</li>
<li>
<a id="vertical-axis-tick-minor" class="item-link smart-select" data-back-on-select="true">
<select name="vertical-axis-tick-minor"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Minor Type</div>
<div class="item-after">None</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="content-block-title">Label Options</div>
<div class="list-block">
<ul>
<li>
<a id="vertical-axis-label-pos" class="item-link smart-select" data-back-on-select="true">
<select name="vertical-axis-label-pos"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title">Label Position</div>
<div class="item-after">None</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<!-- Horizontal Axis view -->
<div id="edit-chart-horizontal-axis">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding" id="edit-chart-horizontal-axis-title">Horizontal Axis</div>
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div>
</div>
<div class="pages">
<div class="page" data-page="edit-chart-horizontal-axis">
<div class="page-content">
<div class="content-block-title">Axis Options</div>
<div class="list-block">
</div>
</div>
</div>
</div>
</div> </div>
\ No newline at end of file
apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
View file @ c90ffcc7
...@@ -154,17 +154,11 @@ define([ ...@@ -154,17 +154,11 @@ define([
}, },
updateItemHandlers: function () { updateItemHandlers: function () {
var selectorsDynamicPage = [ if ($('#edit-cell').length < 1) {
'#edit-cell', return;
'.page[data-page=edit-border-style]', }
'.page[data-page=edit-cell-format]'
].map(function (selector) {
return selector + ' a.item-link[data-page]';
}).join(', ');
$(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this));
// $('.container-edit a.item-link[data-page]').single('click', _.bind(this.onItemClick, this)); $('.container-edit a.item-link[data-page]').single('click', _.bind(this.onItemClick, this));
}, },
showPage: function (templateId, suspendEvent) { showPage: function (templateId, suspendEvent) {
......
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
View file @ c90ffcc7
...@@ -169,14 +169,11 @@ define([ ...@@ -169,14 +169,11 @@ define([
}, },
updateItemHandlers: function () { updateItemHandlers: function () {
var selectorsDynamicPage = [ if ($('#edit-chart').length < 1) {
'#edit-chart', return;
'.page[data-page=edit-chart-style]' }
].map(function (selector) {
return selector + ' a.item-link[data-page]'; $('.container-edit a.item-link[data-page]').single('click', _.bind(this.onItemClick, this));
}).join(', ');
$(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this));
$('.edit-chart-style.subnavbar.categories a').single('click', function () { $('.edit-chart-style.subnavbar.categories a').single('click', function () {
$('.page[data-page=edit-chart-style]').find('.list-block.inputs-list').removeClass('inputs-list'); $('.page[data-page=edit-chart-style]').find('.list-block.inputs-list').removeClass('inputs-list');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7