rallias/Scribe.js
1
0
Fork 0
forked from mirrors/Scribe.js
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dates for timezone

Browse source
This commit is contained in:
Guillaume Wuip 2015-01-01 19:57:16 +01:00
parent b08420a590
commit b40c1fddf5
6 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
static/js/controllers/dateController.js
View file

@ -24,7 +24,7 @@
* Go to to a next page * Go to to a next page
* *
* @param {int} next if < 0, goes to older dates, if > 0 goes to newer dates * @param {int} next if < 0, goes to older dates, if > 0 goes to newer dates
*/ */
$scope.nextPage = function (next) { $scope.nextPage = function (next) {
var currentDate = $location.search().from || Date.now(), var currentDate = $location.search().from || Date.now(),
@ -42,17 +42,21 @@
//build blocks //build blocks
$scope.blocks = dates.map(function (item) { $scope.blocks = dates.map(function (item) {
var itemDate = $rootScope.timezoneDate(item.date);
console.log(item.date);
console.log(itemDate);
return { return {
type : 'date', type : 'date',
messageTop : $filter('date')(item.date, 'MMM'), messageTop : $filter('date')(itemDate, 'MMM'),
message : $filter('date')(item.date, 'd'), message : $filter('date')(itemDate, 'd'),
messageBottom : $filter('date')(item.date, 'yyyy'), messageBottom : $filter('date')(itemDate, 'yyyy'),
click : function () { click : function () {
//save files //save files
logs.setLogs(item.files.map(function (el, index) { logs.setLogs(item.files.map(function (el, index) {
return { return {
selected : index === 0, //select the first by default selected : index === 0, //select the first by default
name : el.name, name : el.name,
path : el.path path : el.path
}; };
@ -62,7 +66,7 @@
$rootScope.go('logs'); $rootScope.go('logs');
} }
}; };
}); });
} }
]); ]);

6
static/js/controllers/folderController.js
View file

@ -12,14 +12,14 @@
'logs', 'logs',
'folder', 'folder',
function ($scope, $rootScope, logs, folder) { function ($scope, $rootScope, logs, folder) {
//reset //reset
$rootScope.sidebar = false; $rootScope.sidebar = false;
$scope.onlyFiles = true; $scope.onlyFiles = true;
//build each block //build each block
$scope.blocks = folder.map(function (item) { $scope.blocks = folder.map(function (item) {
if (item.type !== 'file') { if (item.type !== 'file') {
$scope.onlyFiles = false; $scope.onlyFiles = false;
} }
@ -28,7 +28,7 @@
message : item.name, message : item.name,
click : function () { click : function () {
if (item.type === 'file') { if (item.type === 'file') {
//Save all current files of the folder //Save all current files of the folder
//But select only the clicked one //But select only the clicked one
var newFiles = folder.map(function (file) { var newFiles = folder.map(function (file) {

2
static/js/controllers/homeController.js
View file

@ -17,7 +17,7 @@
//build block for each logWriter //build block for each logWriter
$scope.blocks = $rootScope.logWriters.map(function (item) { $scope.blocks = $rootScope.logWriters.map(function (item) {
return { return {
message : item, message : item,
click : function () { click : function () {

4
static/js/directives/log.js
View file

@ -69,7 +69,9 @@
templateUrl : 'partials/elements/log.html', templateUrl : 'partials/elements/log.html',
replace : true, replace : true,
controller : ['$scope', function ($scope) { controller : ['$rootScope', '$scope', function ($rootScope, $scope) {
$scope.timezoneDate = $rootScope.timezoneDate;
/** /**
* $scope.handleTags * $scope.handleTags

4
static/partials/elements/log.html
View file

@ -13,13 +13,13 @@
<span class="log__item log__time log__time_80" ng-if="showDate != 0 && (showDate == 1 || log.show.date)"> <span class="log__item log__time log__time_80" ng-if="showDate != 0 && (showDate == 1 || log.show.date)">
<span class="log__time__higher"> <span class="log__time__higher">
{{log.context.time | date: 'EEE MMM dd yyyy'}} {{timezoneDate(log.context.time) | date: 'EEE MMM dd yyyy'}}
</span> </span>
</span> </span>
<span class="log__item log__time log__time_122" ng-if="showTime != 0 && (showTime == 1 || log.show.time)"> <span class="log__item log__time log__time_122" ng-if="showTime != 0 && (showTime == 1 || log.show.time)">
<span class="log__time__lower"> <span class="log__time__lower">
{{log.context.time | date: 'yyyy-MM-ddTHH:mm:ss:Z'}} {{timezoneDate(log.context.time) | date: 'yyyy-MM-ddTHH:mm:ss:Z'}}
</span> </span>
</span> </span>

4
static/partials/elements/sidebarLoggers.html
View file

@ -5,11 +5,11 @@
</h3> </h3>
<ul class="content"> <ul class="content">
<li ng-repeat="logger in logWriters" class="sidebar__item"> <li ng-repeat="logger in logWriters" class="sidebar__item">
<a href="" ng-click="go(mode, {path : logger});">{{logger}}</a> <a href="" ng-click="go(mode, {path : logger});">{{logger}}</a>
</li> </li>
</ul> </ul>
</div> </div>