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

fixed calendar month name display
gitea/salix/dev There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2019-04-03 12:29:23 +02:00
parent 3a19141d58
commit d407fc7803
3 changed files with 42 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
front/core/components/calendar/index.html
View File

@ -10,8 +10,8 @@
</vn-auto> </vn-auto>
<vn-one> <vn-one>
<strong> <strong>
<span translate>{{$ctrl.defaultDate | dateTime: 'MMMM'}}</span> <span translate>{{$ctrl.defaultDate | date: 'MMMM'}}</span>
<span>{{$ctrl.defaultDate | dateTime: 'yyyy'}}</span> <span>{{$ctrl.defaultDate | date: 'yyyy'}}</span>
</strong> </strong>
</vn-one> </vn-one>
<vn-auto> <vn-auto>
@ -23,69 +23,41 @@
</vn-icon> </vn-icon>
</vn-auto> </vn-auto>
</vn-horizontal> </vn-horizontal>
<vn-horizontal>
<!-- <vn-auto> <vn-vertical class="body">
<vn-vertical class="body"> <vn-horizontal class="weekdays">
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(1)">
<span></span> <span>L</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(2)">
<span>1</span> <span>M</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(3)">
<span>2</span> <span>X</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(4)">
<span>3</span> <span>J</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(5)">
<span>4</span> <span>V</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(6)">
<span>5</span> <span>S</span>
</section> </section>
<section class="day"> <section class="day" ng-click="$ctrl.selectAll(0)">
<span>6</span> <span>D</span>
</section> </section>
</vn-vertical> </vn-horizontal>
</vn-auto> <vn-horizontal class="days">
<vn-one> --> <section ng-repeat="day in $ctrl.days" class="day {{day.event.className || day.className}}"
<vn-vertical class="body"> ng-click="$ctrl.select($index)"
<vn-horizontal class="weekdays"> ng-style="{'color': day.event.style.color}">
<section class="day" ng-click="$ctrl.selectAll(1)"> <span ng-if="day.event" vn-tooltip="{{day.event.title}}"
<span>L</span> ng-style="{'background-color': day.event.style.background}">
</section> {{::day.dated | date: 'd'}}
<section class="day" ng-click="$ctrl.selectAll(2)"> </span>
<span>M</span> <span ng-if="!day.event">{{::day.dated | date: 'd'}}</span>
</section> </section>
<section class="day" ng-click="$ctrl.selectAll(3)"> </vn-horizontal>
<span>X</span> </vn-vertical>
</section>
<section class="day" ng-click="$ctrl.selectAll(4)">
<span>J</span>
</section>
<section class="day" ng-click="$ctrl.selectAll(5)">
<span>V</span>
</section>
<section class="day" ng-click="$ctrl.selectAll(6)">
<span>S</span>
</section>
<section class="day" ng-click="$ctrl.selectAll(0)">
<span>D</span>
</section>
</vn-horizontal>
<vn-horizontal class="days">
<section ng-repeat="day in $ctrl.days" class="day {{day.event.className || day.className}}"
ng-click="$ctrl.select($index)"
ng-style="{'color': day.event.style.color}">
<span ng-if="day.event" vn-tooltip="{{day.event.title}}"
ng-style="{'background-color': day.event.style.background}">
{{::day.dated | date: 'd'}}
</span>
<span ng-if="!day.event">{{::day.dated | date: 'd'}}</span>
</section>
</vn-horizontal>
</vn-vertical>
</vn-one>
</vn-horizontal>
</div> </div>

3
loopback/locale/es.json
View File

@ -76,5 +76,6 @@
"You cannot remove this department": "No puedes eliminar este departamento", "You cannot remove this department": "No puedes eliminar este departamento",
"The extension must be unique": "La extensión debe ser unica", "The extension must be unique": "La extensión debe ser unica",
"The secret can't be blank": "La contraseña no puede estar en blanco", "The secret can't be blank": "La contraseña no puede estar en blanco",
"EXTENSION_INVALID_FORMAT": "La extensión es invalida" "EXTENSION_INVALID_FORMAT": "La extensión es invalida",
"We weren't able to send this SMS": "No hemos podido enviar el SMS"
} }

1
modules/worker/front/calendar/index.js
View File

@ -98,6 +98,7 @@ class Controller {
now.setDate(1); now.setDate(1);
months[i] = now; months[i] = now;
console.log(now);
} }
return months; return months;