Project for the UPV to develop an app like BlaBlaCar but only for UPV people.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fixed #3

+36 -1
+1
package.json
··· 11 11 "angular": "^1.5.5", 12 12 "angular-cookies": "^1.5.7", 13 13 "angular-google-maps": "^2.3.3", 14 + "angular-i18n": "^1.5.9", 14 15 "angular-simple-logger": "^0.1.7", 15 16 "angular-ui-bootstrap": "^1.3.3", 16 17 "angular-ui-calendar": "^1.0.2",
+5
upvcarshare/static/src/js/app.js
··· 15 15 // General Angular 1.5 App 16 16 // ----------------------------------------------------------------------------- 17 17 import angular from 'angular'; 18 + require("angular-i18n/angular-locale_es-es"); 19 + 20 + 21 + // Project modules 22 + // ----------------------------------------------------------------------------- 18 23 import Common from './common'; 19 24 import Messenger from './messenger'; 20 25 import Journeys from './journeys';
+28 -1
upvcarshare/static/src/js/journeys/journeys.controller.js
··· 103 103 }, 104 104 timeOptions: { 105 105 showMeridian: false 106 + }, 107 + buttonBar: { 108 + show: true, 109 + now: { 110 + show: true, 111 + text: 'Ahora' 112 + }, 113 + today: { 114 + show: true, 115 + text: 'Hoy' 116 + }, 117 + clear: { 118 + show: true, 119 + text: 'Limpiar' 120 + }, 121 + date: { 122 + show: true, 123 + text: 'Fecha' 124 + }, 125 + time: { 126 + show: true, 127 + text: 'Hora' 128 + }, 129 + close: { 130 + show: true, 131 + text: 'Cerrar' 132 + } 106 133 } 107 134 }; 108 135 // Call to onUpdate when $ctrl.picker.date changes. ··· 129 156 } 130 157 131 158 } 132 - DatetimeController.$inject = ['$scope'] 159 + DatetimeController.$inject = ['$scope']; 133 160 134 161 135 162 class DateController {
+2
upvcarshare/templates/partials/journeys/datetime.html
··· 1 + {% load i18n %} 1 2 <div class="input-group"> 2 3 <input type="text" 3 4 class="form-control" ··· 6 7 is-open="$ctrl.picker.open" 7 8 datepicker-options="$ctrl.picker.dateOptions" 8 9 timepicker-options="$ctrl.picker.timeOptions" 10 + button-bar="$ctrl.picker.buttonBar" 9 11 name="[[$ctrl.fieldName]]" 10 12 id="[[$ctrl.fieldId]]"> 11 13 <span class="input-group-addon">