diff --git a/apps/spreadsheeteditor/mobile/app/template/AddOther.template b/apps/spreadsheeteditor/mobile/app/template/AddOther.template
index 3b1afdb83..7db329b2a 100644
--- a/apps/spreadsheeteditor/mobile/app/template/AddOther.template
+++ b/apps/spreadsheeteditor/mobile/app/template/AddOther.template
@@ -180,4 +180,47 @@
+
+
+
+
+
+
+
+
<%= scope.textSort %>
+
+
+
+
+
+
+
+ -
+
+
+
<%= scope.textFilter %>
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
index 3eba05fd2..3681e28b7 100644
--- a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
+++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
@@ -62,8 +62,10 @@ define([
initEvents: function () {
var me = this;
- $('#add-other-insimage').single('click', _.bind(me.showInsertImage, me));
- $('#add-other-link').single('click', _.bind(me.showLink, me));
+ var $page = $('#add-other');
+ $page.find('#add-other-insimage').single('click', _.bind(me.showInsertImage, me));
+ $page.find('#add-other-link').single('click', _.bind(me.showLink, me));
+ $page.find('#add-other-sort').single('click', _.bind(me.showSortPage, me));
me.initControls();
},
@@ -135,6 +137,10 @@ define([
$('#add-link-insert').single('click', _.buffered(this.clickInsertLink, 100, this));
},
+ showSortPage: function (e) {
+ this.showPage('#addother-sort');
+ },
+
clickInsertLink: function (e) {
var url = $('#add-link-url input').val(),
display = $('#add-link-display input').val(),
@@ -170,23 +176,12 @@ define([
textDisplay: 'Display',
textTip: 'Screen Tip',
textInsert: 'Insert',
- textPosition: 'Position',
- textLeftTop: 'Left Top',
- textCenterTop: 'Center Top',
- textRightTop: 'Right Top',
- textLeftBottom: 'Left Bottom',
- textCenterBottom: 'Center Bottom',
- textRightBottom: 'Right Bottom',
- textCurrentPos: 'Current Position',
- textNextPage: 'Next Page',
- textContPage: 'Continuous Page',
- textEvenPage: 'Even Page',
- textOddPage: 'Odd Page'
- , textFromLibrary: 'Picture from Library'
- , textFromURL: 'Picture from URL'
- , textLinkSettings: 'Link Settings'
- , textAddress: 'Address'
- , textImageURL: 'Image URL'
+ textFromLibrary: 'Picture from Library',
+ textFromURL: 'Picture from URL',
+ textLinkSettings: 'Link Settings',
+ textAddress: 'Address',
+ textImageURL: 'Image URL',
+ textFilter: 'Filter'
}
})(), SSE.Views.AddOther || {}))
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/resources/img/sort-a-z.png b/apps/spreadsheeteditor/mobile/resources/img/sort-a-z.png
new file mode 100644
index 000000000..0c4141bc7
Binary files /dev/null and b/apps/spreadsheeteditor/mobile/resources/img/sort-a-z.png differ
diff --git a/apps/spreadsheeteditor/mobile/resources/img/sort-z-a.png b/apps/spreadsheeteditor/mobile/resources/img/sort-z-a.png
new file mode 100644
index 000000000..ea4026a15
Binary files /dev/null and b/apps/spreadsheeteditor/mobile/resources/img/sort-z-a.png differ
diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
index 42cfe36e2..cb8c64f86 100644
--- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
+++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
@@ -164,6 +164,17 @@ i.icon {
height: 28px;
.encoded-svg-background('');
}
+
+ &.sortdown {
+ width: 22px;
+ height: 22px;
+ background-image: url(../img/sort-a-z.png);
+ }
+ &.sortup {
+ width: 22px;
+ height: 22px;
+ background-image: url(../img/sort-z-a.png);
+ }
}
.chart-types .thumb {
@@ -242,4 +253,4 @@ i.icon {
&.bar3dpsnormal {
background-image: url('../img/charts/chart-20.png');
}
-}
\ No newline at end of file
+}
diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
index ca07b04aa..a382b63cc 100644
--- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
+++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
@@ -113,6 +113,17 @@ i.icon {
height: 28px;
.encoded-svg-background('');
}
+
+ &.sortdown {
+ width: 22px;
+ height: 22px;
+ background-image: url(../img/sort-a-z.png);
+ }
+ &.sortup {
+ width: 22px;
+ height: 22px;
+ background-image: url(../img/sort-z-a.png);
+ }
}
// Overwrite color for toolbar