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

[DE mobile] Add styles collaboration.

Browse source
This commit is contained in:
Julia Svinareva 2019-05-17 17:18:56 +03:00
parent 1723da3324
commit 4f9d1e85f3
8 changed files with 228 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apps/common/mobile/resources/less/ios/_collaboration.less Normal file
View file

@ -0,0 +1,54 @@
.page-change {
.block-description {
background-color: #fff;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
}
#user-name {
font-size: 17px;
line-height: 22px;
color: #000000;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
color: #8C8C8C;
margin: 0;
margin-top: 3px;
}
#text-change {
color: #000000;
font-size: 15px;
line-height: 18px;
margin: 0;
margin-top: 10px;
}
.block-btn {
display: flex;
flex-direction: row;
justify-content: space-around;
margin: 26px 0;
#btn-next-change, #btn-reject-change {
margin-left: 20px;
}
.link {
height: 48px;
width: 48px;
display: inline-block;
.icon {
background-position: center;
height: 48px;
width: 48px;
}
}
}
}
.navbar .center-collaboration {
display: flex;
justify-content: space-around;
margin-left: 45px;
}

54
apps/common/mobile/resources/less/material/_collaboration.less Normal file
View file

@ -0,0 +1,54 @@
.page-change {
.block-description {
background-color: #fff;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
}
#user-name {
font-size: 17px;
line-height: 22px;
color: #000000;
margin: 0;
}
#date-change {
font-size: 14px;
line-height: 18px;
color: #8C8C8C;
margin: 0;
margin-top: 3px;
}
#text-change {
color: #000000;
font-size: 15px;
line-height: 18px;
margin: 0;
margin-top: 10px;
}
.block-btn {
display: flex;
flex-direction: row;
justify-content: space-around;
margin: 0;
padding: 26px 0;
background-color: #EFEFF4;
#btn-next-change, #btn-reject-change {
margin-left: 20px;
}
.link {
display: inline-block;
.icon {
background-position: center;
height: 48px;
width: 48px;
}
}
}
}
.navbar .center-collaboration {
text-align: center;
margin-left: 54px;
}

5
apps/documenteditor/mobile/app/controller/Collaboration.js
View file

@ -239,6 +239,9 @@ define([
if(arrChangeReview.length == 0) { if(arrChangeReview.length == 0) {
this.api.asc_GetNextRevisionsChange(); this.api.asc_GetNextRevisionsChange();
} }
if(arrChangeReview.length == 0) {
$('#current-change').css('display','none');
}
$('#current-change #date-change').html(arrChangeReview[0]); $('#current-change #date-change').html(arrChangeReview[0]);
$('#current-change #user-name').html(arrChangeReview[1]); $('#current-change #user-name').html(arrChangeReview[1]);
$('#current-change #text-change').html(arrChangeReview[2]); $('#current-change #text-change').html(arrChangeReview[2]);
@ -282,7 +285,9 @@ define([
$('#current-change #date-change').empty(); $('#current-change #date-change').empty();
$('#current-change #user-name').empty(); $('#current-change #user-name').empty();
$('#current-change #text-change').empty(); $('#current-change #text-change').empty();
$('#current-change').css('display','none');
} else { } else {
$('#current-change').css('display','block');
this.initChange(); this.initChange();
} }
}, },

20
apps/documenteditor/mobile/app/template/Collaboration.template
View file

@ -2,7 +2,7 @@
<div id="collaboration-root-view"> <div id="collaboration-root-view">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="center sliding categories"><%= scope.textCollaboration %></div> <div class="center sliding categories center-collaboration"><%= scope.textCollaboration %></div>
<div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div> <div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div> </div>
</div> </div>
@ -169,15 +169,19 @@
</div> </div>
</div> </div>
<div class="pages"> <div class="pages">
<div class="page" data-page="change-view"> <div class="page page-change" data-page="change-view">
<div class="page-content"> <div class="page-content">
<div class="content-block"> <div class="content-block block-btn">
<a href="#" id="btn-prev-change" class="link icon-only"><i class="icon icon-undo"></i></a> <span class="next-prev">
<a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-redo"></i></a> <a href="#" id="btn-prev-change" class="link icon-only"><i class="icon icon-review"></i></a>
<a href="#" id="btn-accept-change" class="link icon-only disabled">Accept</a> <a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-review"></i></a>
<a href="#" id="btn-reject-change" class="link icon-only disabled">Reject</a> </span>
<span class="accept-reject">
<a href="#" id="btn-accept-change" class="link icon-only disabled"><i class="icon icon-review"></i></a>
<a href="#" id="btn-reject-change" class="link icon-only disabled"><i class="icon icon-review"></i></a>
</span>
</div> </div>
<div id="current-change" class="content-block"> <div id="current-change" class="content-block block-description">
<p id="user-name"></p> <p id="user-name"></p>
<p id="date-change"></p> <p id="date-change"></p>
<p id="text-change"></p> <p id="text-change"></p>

51
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6264,6 +6264,57 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
margin-left: 20px; margin-left: 20px;
color: #212121; color: #212121;
} }
.page-change .block-description {
background-color: #fff;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
}
.page-change #user-name {
font-size: 17px;
line-height: 22px;
color: #000000;
margin: 0;
}
.page-change #date-change {
font-size: 14px;
line-height: 18px;
color: #8C8C8C;
margin: 0;
margin-top: 3px;
}
.page-change #text-change {
color: #000000;
font-size: 15px;
line-height: 18px;
margin: 0;
margin-top: 10px;
}
.page-change .block-btn {
display: flex;
flex-direction: row;
justify-content: space-around;
margin: 26px 0;
}
.page-change .block-btn #btn-next-change,
.page-change .block-btn #btn-reject-change {
margin-left: 20px;
}
.page-change .block-btn .link {
height: 48px;
width: 48px;
display: inline-block;
}
.page-change .block-btn .link .icon {
background-position: center;
height: 48px;
width: 48px;
}
.navbar .center-collaboration {
display: flex;
justify-content: space-around;
margin-left: 45px;
}
.tablet .searchbar.document.replace .center .searchbar:first-child { .tablet .searchbar.document.replace .center .searchbar:first-child {
margin-right: 10px; margin-right: 10px;
} }

50
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -5863,6 +5863,56 @@ html.phone .document-menu .list-block .item-link {
margin-left: 20px; margin-left: 20px;
color: #212121; color: #212121;
} }
.page-change .block-description {
background-color: #fff;
padding-top: 15px;
padding-bottom: 15px;
margin: 0;
}
.page-change #user-name {
font-size: 17px;
line-height: 22px;
color: #000000;
margin: 0;
}
.page-change #date-change {
font-size: 14px;
line-height: 18px;
color: #8C8C8C;
margin: 0;
margin-top: 3px;
}
.page-change #text-change {
color: #000000;
font-size: 15px;
line-height: 18px;
margin: 0;
margin-top: 10px;
}
.page-change .block-btn {
display: flex;
flex-direction: row;
justify-content: space-around;
margin: 0;
padding: 26px 0;
background-color: #EFEFF4;
}
.page-change .block-btn #btn-next-change,
.page-change .block-btn #btn-reject-change {
margin-left: 20px;
}
.page-change .block-btn .link {
display: inline-block;
}
.page-change .block-btn .link .icon {
background-position: center;
height: 48px;
width: 48px;
}
.navbar .center-collaboration {
text-align: center;
margin-left: 54px;
}
.tablet .searchbar.document.replace .center > .replace { .tablet .searchbar.document.replace .center > .replace {
display: flex; display: flex;
} }

1
apps/documenteditor/mobile/resources/less/app-ios.less
View file

@ -72,6 +72,7 @@ input, textarea {
@import url('../../../../common/mobile/resources/less/ios/_color-palette.less'); @import url('../../../../common/mobile/resources/less/ios/_color-palette.less');
@import url('../../../../common/mobile/resources/less/ios/_about.less'); @import url('../../../../common/mobile/resources/less/ios/_about.less');
@import url('../../../../common/mobile/resources/less/ios/_color-schema.less'); @import url('../../../../common/mobile/resources/less/ios/_color-schema.less');
@import url('../../../../common/mobile/resources/less/ios/_collaboration.less');
@import url('ios/_search.less'); @import url('ios/_search.less');

1
apps/documenteditor/mobile/resources/less/app-material.less
View file

@ -54,6 +54,7 @@
@import url('../../../../common/mobile/resources/less/material/_color-palette.less'); @import url('../../../../common/mobile/resources/less/material/_color-palette.less');
@import url('../../../../common/mobile/resources/less/material/_about.less'); @import url('../../../../common/mobile/resources/less/material/_about.less');
@import url('../../../../common/mobile/resources/less/material/_color-schema.less'); @import url('../../../../common/mobile/resources/less/material/_color-schema.less');
@import url('../../../../common/mobile/resources/less/material/_collaboration.less');
@import url('material/_search.less'); @import url('material/_search.less');
@import url('material/_icons.less'); @import url('material/_icons.less');