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

[DE] Update icons for roles windows

Browse source
This commit is contained in:
Julia Radzhabova 2022-11-25 13:02:20 +03:00
parent 68e7e292b5
commit 5251f9f5e3
8 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/view/RolesManagerDlg.js
View file

@ -93,7 +93,7 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
emptyText: this.textEmpty,
itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="">',
'<div class="listitem-icon toolbar__icon <%= scope.getIconCls(index) %>"></div>',
'<div class="listitem-icon"><svg class=""><use xlink:href="#svg-icon-<%= scope.getIconCls(index) %>"></use></svg></div>',
'<div style="min-width: 25px;text-align:center; padding-right: 5px;"><%= index+1 %></div>',
'<div style="min-width: 25px;">',
'<span class="color" style="background: <% if (color) { %>#<%= Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()) %><% } else { %> transparent <% } %>;"></span>',
@ -197,7 +197,9 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
},
getIconCls: function(index) {
return (index===0) ? 'btn-arrow-up' : (index===this.rolesList.store.length-1 ? 'btn-arrow-down' : 'btn-border-insidevert');
if (this.rolesList.store.length===1)
return 'Point';
return (index===0) ? 'StartPoint' : (index===this.rolesList.store.length-1 ? 'EndPoint' : 'MiddlePoint');
},
onEditRole: function (isEdit) {

6
apps/documenteditor/main/app/view/SaveFormDlg.js
View file

@ -112,7 +112,7 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow',
emptyText: this.textEmpty,
itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="border-color: transparent;">',
'<div class="listitem-icon toolbar__icon <%= scope.getIconCls(index) %>"></div>',
'<div class="listitem-icon"><svg class=""><use xlink:href="#svg-icon-<%= scope.getIconCls(index) %>"></use></svg></div>',
'<div style="flex-grow: 1;padding-right: 5px;"><%= Common.Utils.String.htmlEncode(name) %></div>',
'</div>'
].join(''))
@ -144,7 +144,9 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow',
},
getIconCls: function(index) {
return (index===0) ? 'btn-arrow-up' : (index===this.rolesList.store.length-1 ? 'btn-arrow-down' : 'btn-border-insidevert');
if (this.rolesList.store.length===1)
return 'Point';
return (index===0) ? 'StartPoint' : (index===this.rolesList.store.length-1 ? 'EndPoint' : 'MiddlePoint');
},
txtTitle: 'Save as Form',

1
apps/documenteditor/main/index.html
View file

@ -332,6 +332,7 @@
<img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
<img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
<img class="inline-svg" src="../../common/main/resources/img/toolbar/equationicons.svg">
<img class="inline-svg" src="resources/img/form-points.svg">
<script>
var svgpoints = document.querySelectorAll('img.inline-svg');
SVGInjector(svgpoints);

1
apps/documenteditor/main/index.html.deploy
View file

@ -322,6 +322,7 @@
<inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<inline src="../../common/main/resources/img/toolbar/equationicons.svg" />
<inline src="resources/img/form-points.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>

1
apps/documenteditor/main/index_loader.html
View file

@ -272,6 +272,7 @@
<img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
<img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
<img class="inline-svg" src="../../common/main/resources/img/toolbar/equationicons.svg">
<img class="inline-svg" src="resources/img/form-points.svg">
<script>
var svgpoints = document.querySelectorAll('img.inline-svg');
SVGInjector(svgpoints);

2
apps/documenteditor/main/index_loader.html.deploy
View file

@ -321,7 +321,7 @@
<inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<inline src="../../common/main/resources/img/toolbar/equationicons.svg" />
<inline src="resources/img/form-points.svg" />
<div id="viewport"></div>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>

22
apps/documenteditor/main/resources/img/form-points.svg Normal file
View file

@ -0,0 +1,22 @@
<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg">
<symbol id="svg-icon-Point" viewBox="0 0 20 28">
<g id="Point">
<path id="Ellipse 121 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M9.5 17C10.8807 17 12 15.8807 12 14.5C12 13.1193 10.8807 12 9.5 12C8.11929 12 7 13.1193 7 14.5C7 15.8807 8.11929 17 9.5 17ZM9.5 18C11.433 18 13 16.433 13 14.5C13 12.567 11.433 11 9.5 11C7.567 11 6 12.567 6 14.5C6 16.433 7.567 18 9.5 18Z"/>
</g>
</symbol>
<symbol id="svg-icon-StartPoint" viewBox="20 0 20 28">
<g id="StartPoint">
<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M32 14.5C32 15.8807 30.8807 17 29.5 17C28.1193 17 27 15.8807 27 14.5C27 13.1193 28.1193 12 29.5 12C30.8807 12 32 13.1193 32 14.5ZM33 14.5C33 16.433 31.433 18 29.5 18C27.567 18 26 16.433 26 14.5C26 12.567 27.567 11 29.5 11C31.433 11 33 12.567 33 14.5ZM29.5 18H30V20H29V18H29.5ZM30 22V24H29V22H30ZM30 28V26H29V28H30Z"/>
</g>
</symbol>
<symbol id="svg-icon-MiddlePoint" viewBox="40 0 20 28">
<g id="MiddlePoint">
<path id="Union_2" fill-rule="evenodd" clip-rule="evenodd" d="M49 2H50V4H49V2ZM49.5 17C50.8807 17 52 15.8807 52 14.5C52 13.1193 50.8807 12 49.5 12C48.1193 12 47 13.1193 47 14.5C47 15.8807 48.1193 17 49.5 17ZM49.5 18C51.433 18 53 16.433 53 14.5C53 12.567 51.433 11 49.5 11H50V10H49V11H49.5C47.567 11 46 12.567 46 14.5C46 16.433 47.567 18 49.5 18ZM49.5 18H49V20H50V18H49.5ZM50 6H49V8H50V6ZM50 22V24H49V22H50ZM50 28V26H49V28H50Z"/>
</g>
</symbol>
<symbol id="svg-icon-EndPoint" viewBox="60 0 20 28">
<g id="EndPoint">
<path id="Union_3" fill-rule="evenodd" clip-rule="evenodd" d="M70 2H69V4H70V2ZM72 14.5C72 15.8807 70.8807 17 69.5 17C68.1193 17 67 15.8807 67 14.5C67 13.1193 68.1193 12 69.5 12C70.8807 12 72 13.1193 72 14.5ZM73 14.5C73 16.433 71.433 18 69.5 18C67.567 18 66 16.433 66 14.5C66 12.567 67.567 11 69.5 11C71.433 11 73 12.567 73 14.5ZM69.5 11H69V10H70V11H69.5ZM69 6H70V8H69V6Z"/>
</g>
</symbol>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

25
apps/documenteditor/main/resources/less/advanced-settings.less
View file

@ -79,9 +79,16 @@
&.no-borders > .listview .item {
border-width: 0 !important;
}
.item {
padding: 0 6px;
}
@item-width: 20px;
@item-height: 28px;
.list-item {
display: flex;
align-items: center;
height: @item-height;
span.color {
display: block;
@ -100,16 +107,24 @@
}
.listitem-icon {
width: 20px;
height: 20px;
vertical-align: middle;
width: @item-width;
height: @item-height;
margin-right: 5px;
svg {
width: @item-width;
height: @item-height;
fill: @text-normal-ie;
fill: @text-normal;
}
}
.selected {
.listitem-icon {
background-position-x: -20px;
background-position-x: @button-small-active-icon-offset-x;
svg {
fill: @text-normal-pressed-ie;
fill: @text-normal-pressed;
}
}
}
}