verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

2790-dialog_shortcuts #570

Closed
Ghost wants to merge 15 commits from 2790-dialog_shortcuts into dev
pull from: 2790-dialog_shortcuts
merge into: verdnatura:dev
Conversation 0 Commits 15 Files Changed 5 +105 -45
3 changed files with 105 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9be056bbda - Show all commits

78
front/salix/components/home/home.html
View File

@ -1,6 +1,5 @@
<div> <div class="shortcutsHeader">
<span ng-click="$ctrl.showShortcuts()" vn-tooltip="Shortcuts">Shortcuts</span> <span ng-click="$ctrl.showShortcuts()" translate>Shortcuts</span>
<vn-icon-button icon="search" ng-click="$ctrl.showShortcuts()"></vn-icon-button>
</div> </div>
<div> <div>
<div class="top-border"> <div class="top-border">
@ -73,60 +72,59 @@
<vn-dialog class="edit" <vn-dialog class="edit"
vn-id="shortcuts"> vn-id="shortcuts">
<tpl-body> <tpl-body>
<div class="dialogHeader">ACCESO RÁPIDO</div>
Ghost marked this conversation as resolved Outdated
joan commented 2021-03-10 08:37:08 +00:00
Outdated
Review
Copy Link

Faltan las traducciones

Faltan las traducciones
<table> <table>
<thead>
<tr>
<th colspan="7">ACCESO RÁPIDO</th>
</tr>
</thead>
<tbody> <tbody>
<tr> <tr>
<td><span class="shortcuts-words">Ctrl</span></td> <td class="tdBorder"><span class="shortcuts-words">Ctrl</span></td>
Ghost marked this conversation as resolved Outdated
joan commented 2021-03-10 08:38:14 +00:00
Outdated
Review
Copy Link

Si supera los 80 carácteres bajar de linea

Si supera los 80 carácteres bajar de linea
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">Altr</span></td> <td class="tdBorder"><span class="shortcuts-words">Altr</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">A</span></td> <td class="tdBorder"><span class="shortcuts-words">A</span></td>
<td><span class="arrowStyle">🠮</span></td>
<td> <td>
<vn-icon icon="icon-item"> <vn-icon class="iconStyle" icon="icon-item"></vn-icon>
</vn-icon>
</td> </td>
<td><span>ARTÍCULOS</span></td> <td><span class="titleStyle">ARTÍCULOS</span></td>
</tr> </tr>
<tr><td colspan="7"></td></tr> <tr><td colspan="8"></td></tr>
<tr> <tr>
<td><span class="shortcuts-words">Ctrl</span></td> <td class="tdBorder"><span class="shortcuts-words">Ctrl</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">Altr</span></td> <td class="tdBorder"><span class="shortcuts-words">Altr</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">T</span></td> <td class="tdBorder"><span class="shortcuts-words">T</span></td>
<td><span class="arrowStyle">🠮</span></td>
<td> <td>
<vn-icon icon="icon-ticket"></vn-icon> <vn-icon class="iconStyle" icon="icon-ticket"></vn-icon>
</td> </td>
<td><span>TICKETS</span></td> <td><span class="titleStyle">TICKETS</span></td>
</tr> </tr>
<tr><td colspan="7"></td></tr> <tr><td colspan="8"></td></tr>
<tr> <tr>
<td><span class="shortcuts-words">Ctrl</span></td> <td class="tdBorder"><span class="shortcuts-words">Ctrl</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">Altr</span></td> <td class="tdBorder"><span class="shortcuts-words">Altr</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">R</span></td> <td class="tdBorder"><span class="shortcuts-words">R</span></td>
<td><span class="arrowStyle">🠮</span></td>
<td> <td>
<vn-icon icon="icon-claims"></vn-icon> <vn-icon class="iconStyle" icon="icon-claims"></vn-icon>
</td> </td>
<td><span>RECLAMACIONES</span></td> <td><span class="titleStyle">RECLAMACIONES</span></td>
</tr> </tr>
<tr><td colspan="7"></td></tr> <tr><td colspan="8"></td></tr>
<tr> <tr>
<td><span class="shortcuts-words">Ctrl</span></td> <td class="tdBorder"><span class="shortcuts-words">Ctrl</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">Altr</span></td> <td class="tdBorder"><span class="shortcuts-words">Altr</span></td>
<td><span>+</span></td> <td><span class="plusStyle">+</span></td>
<td><span class="shortcuts-words">C</span></td> <td class="tdBorder"><span class="shortcuts-words">C</span></td>
<td><span class="arrowStyle">🠮</span></td>
<td> <td>
<vn-icon icon="persons"></vn-icon> <vn-icon class="iconStyle" icon="persons"></vn-icon>
</td> </td>
<td><span>CLIENTES</span></td> <td><span class="titleStyle">CLIENTES</span></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

1
front/salix/components/home/locale/es.yml
View File

@ -1,4 +1,5 @@
Favorites: Favoritos Favorites: Favoritos
Shortcuts: Acceso rápido
You can set modules as favorites by clicking their icon: Puedes establecer módulos como favoritos haciendo clic en el icono You can set modules as favorites by clicking their icon: Puedes establecer módulos como favoritos haciendo clic en el icono
Add to favorites: Añadir a favoritos. Add to favorites: Añadir a favoritos.
Remove from favorites: Quitar de favoritos. Remove from favorites: Quitar de favoritos.

71
front/salix/components/home/style.scss
View File

@ -110,10 +110,71 @@ vn-home {
} }
} }
.shortcuts-words{ .tdBorder {
border-radius: 5px 5px 5px; border-radius: 5px 5px 5px;
border: 3px solid black; width: 75px;
font-size: 40px; border: 3px solid rgba(0, 0, 0, 0.781);
padding: 2px; }
.shortcuts-words {
font-size: 25px;
padding-left: 20px;
padding-right: 20px;
float: left;
margin-left: -15px;
margin-top: -40px;
}
.plusStyle {
font-size: 50px;
padding-left: 10px;
padding-right: 10px;
}
.arrowStyle {
font-size: 50px;
padding-left: 10px;
padding-right: 10px;
}
.dialogHeader {
text-align: center;
background-color: $color-main;
font-size: 25px;
color: white;
font-weight: bold;
padding: 10px;
margin-bottom: 50px;
}
.titleStyle {
font-size: 30px;
font-weight: 400;
padding-left: 10px;
padding-right: 10px;
}
.iconStyle {
color: white;
background-color: $color-main;
font-size: 50px;
font-weight: normal;
width: 50px;
padding: 5px;
border-radius: 5px 5px 5px;
}
.shortcutsHeader {
margin-top: -20px;
background-color: #3d3d3d;
max-width: 120px;
font-size: 18px;
font-weight: 500;
color: white;
text-align: center;
padding: 10px;
cursor: pointer;
border-radius: 5px;
margin-bottom: 30px;
} }