Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mobile-settings' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-12 13:38:26 +03:00
parent a65635c977 03c94b12eb
commit 66b9884086
5 changed files with 54 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
apps/common/mobile/lib/view/Collaboration.js
View file

@ -147,41 +147,51 @@ define([
},
renderComments: function (comments) {
var $listComments = $('#comments-list'),
items = [];
_.each(comments, function (comment) {
var itemTemplate = [
'<li class="comment item-content">',
'<div class="item-inner">',
'<p class="user-name"><%= item.username %></p>',
'<p class="comment-date"><%= item.date %></p>',
'<% if(item.quote) {%>',
'<p class="comment-quote" data-id="<%= item.uid %>"><%= item.quote %></p>',
'<% } %>',
'<p class="comment-text"><%= item.comment %></p>',
'<% if(replys > 0) {%>',
'<ul class="list-reply">',
'<% _.each(item.replys, function (reply) { %>',
'<li class="reply-item">',
'<p class="user-name"><%= reply.username %></p>',
'<p class="reply-date"><%= reply.date %></p>',
'<p class="reply-text"><%= reply.reply %></p>',
'</li>',
'<% }); %>',
'</ul>',
'<% } %>',
'</div>',
'</li>'
].join('');
items.push(_.template(itemTemplate)({
android: Framework7.prototype.device.android,
item: comment,
replys: comment.replys.length
}));
});
$listComments.html(items);
var $pageComments = $('.page-comments .page-content');
if (!comments) {
if ($('.comment').length > 0) {
$('.comment').remove();
}
var template = '<div id="no-comments" style="text-align: center; margin-top: 35px;">' + this.textNoComments + '</div>';
$pageComments.append(_.template(template));
} else {
if ($('#no-comments').length > 0) {
$('#no-comments').remove();
}
var $listComments = $('#comments-list'),
items = [];
_.each(comments, function (comment) {
var itemTemplate = [
'<li class="comment item-content">',
'<div class="item-inner">',
'<p class="user-name"><%= item.username %></p>',
'<p class="comment-date"><%= item.date %></p>',
'<% if(item.quote) {%>',
'<p class="comment-quote" data-id="<%= item.uid %>"><%= item.quote %></p>',
'<% } %>',
'<p class="comment-text"><%= item.comment %></p>',
'<% if(replys > 0) {%>',
'<ul class="list-reply">',
'<% _.each(item.replys, function (reply) { %>',
'<li class="reply-item">',
'<p class="user-name"><%= reply.username %></p>',
'<p class="reply-date"><%= reply.date %></p>',
'<p class="reply-text"><%= reply.reply %></p>',
'</li>',
'<% }); %>',
'</ul>',
'<% } %>',
'</div>',
'</li>'
].join('');
items.push(_.template(itemTemplate)({
android: Framework7.prototype.device.android,
item: comment,
replys: comment.replys.length,
}));
});
$listComments.html(items);
}
},
@ -198,8 +208,8 @@ define([
textFinal: 'Final',
textOriginal: 'Original',
textChange: 'Review Change',
textEditUsers: 'Users'
textEditUsers: 'Users',
textNoComments: "This document doesn\'t contain comments"
}
})(), Common.Views.Collaboration || {}))
});

1
apps/documenteditor/mobile/locale/en.json
View file

@ -75,6 +75,7 @@
"Common.Views.Collaboration.textReview": "Track Changes",
"Common.Views.Collaboration.textReviewing": "Review",
"Common.Views.Collaboration.textСomments": "Сomments",
"Common.Views.Collaboration.textNoComments": "This document doesn't contain comments",
"DE.Controllers.AddContainer.textImage": "Image",
"DE.Controllers.AddContainer.textOther": "Other",
"DE.Controllers.AddContainer.textShape": "Shape",

1
apps/presentationeditor/mobile/locale/en.json
View file

@ -8,6 +8,7 @@
"Common.Views.Collaboration.textCollaboration": "Collaboration",
"Common.Views.Collaboration.textEditUsers": "Users",
"Common.Views.Collaboration.textСomments": "Сomments",
"Common.Views.Collaboration.textNoComments": "This presentation doesn't contain comments",
"PE.Controllers.AddContainer.textImage": "Image",
"PE.Controllers.AddContainer.textLink": "Link",
"PE.Controllers.AddContainer.textShape": "Shape",

5
apps/spreadsheeteditor/mobile/app/view/add/AddLink.js
View file

@ -200,7 +200,7 @@ define([
var $view = $('.settings');
var disabled = text == 'locked';
disabled && (text = ' ');
disabled && (text = this.textSelectedRange);
$view.find('#add-link-display input').prop('disabled', disabled).val(text);
$view.find('#add-link-display .label').toggleClass('disabled', disabled);
},
@ -261,7 +261,8 @@ define([
textInternalLink: 'Internal Data Range',
textSheet: 'Sheet',
textRange: 'Range',
textRequired: 'Required'
textRequired: 'Required',
textSelectedRange: 'Selected Range'
}
})(), SSE.Views.AddLink || {}))
});

2
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -8,6 +8,7 @@
"Common.Views.Collaboration.textCollaboration": "Collaboration",
"Common.Views.Collaboration.textEditUsers": "Users",
"Common.Views.Collaboration.textСomments": "Сomments",
"Common.Views.Collaboration.textNoComments": "This spreadsheet doesn't contain comments",
"SSE.Controllers.AddChart.txtDiagramTitle": "Chart Title",
"SSE.Controllers.AddChart.txtSeries": "Series",
"SSE.Controllers.AddChart.txtXAxis": "X Axis",
@ -332,6 +333,7 @@
"SSE.Views.AddLink.textRequired": "Required",
"SSE.Views.AddLink.textSheet": "Sheet",
"SSE.Views.AddLink.textTip": "Screen Tip",
"SSE.Views.AddLink.textSelectedRange": "Selected Range",
"SSE.Views.AddOther.textAddress": "Address",
"SSE.Views.AddOther.textBack": "Back",
"SSE.Views.AddOther.textFilter": "Filter",