diff --git a/site/public/javascript/controllers/project.js b/site/public/javascript/controllers/project.js index 6b74596..9126823 100644 --- a/site/public/javascript/controllers/project.js +++ b/site/public/javascript/controllers/project.js @@ -29,7 +29,12 @@ application.controller( $scope.always_last_version = !$scope.always_last_version; }; - $scope.mark_all_as_read = function() + $scope.show_differences_toggle_click = function() + { + $scope.show_differences = !$scope.show_differences; + }; + + $scope.mark_all_as_read_click = function() { // Each file for( var _file_key in project.files ) @@ -74,6 +79,8 @@ application.controller( version.active = true; $scope.version = version; + + $scope.file.notif = 0; }; $scope.init = function( project_slug ) @@ -103,6 +110,8 @@ application.controller( $scope.version = data.version; $scope.version.active = true; + + $scope.file.notif = 0; } ); } } @@ -111,6 +120,7 @@ application.controller( $scope.project = project; $scope.file = null; $scope.always_last_version = true; + $scope.show_differences = true; $scope.version = null; } ] diff --git a/site/public/stylesheets/style.css b/site/public/stylesheets/style.css index ce384fc..38b0672 100644 --- a/site/public/stylesheets/style.css +++ b/site/public/stylesheets/style.css @@ -32,7 +32,10 @@ section.page-project .aside .aside-header {padding:10px;background:#3b3f4e;} section.page-project .aside .aside-header .always-last-version-toggle {cursor:pointer;} section.page-project .aside .aside-header .always-last-version-toggle .switch {display:inline-block;width:12px;height:12px;border:1px solid #f1f5ff;} section.page-project .aside .aside-header .always-last-version-toggle.active .switch {background:#f1f5ff;} -section.page-project .aside .aside-tree {position:absolute;top:48px;left:0;bottom:0;width:100%;overflow:auto;} +section.page-project .aside .aside-header .show-differences-toggle {cursor:pointer;} +section.page-project .aside .aside-header .show-differences-toggle .switch {display:inline-block;width:12px;height:12px;border:1px solid #f1f5ff;} +section.page-project .aside .aside-header .show-differences-toggle.active .switch {background:#f1f5ff;} +section.page-project .aside .aside-tree {position:absolute;top:76px;left:0;bottom:0;width:100%;overflow:auto;} section.page-project section.main {position:absolute;top:0;right:0;bottom:0;left:240px;} section.page-project section.no-file {position:absolute;top:0;right:0;bottom:0;left:0;} section.page-project section.file {position:absolute;top:0;right:0;bottom:0;left:0;} @@ -45,8 +48,9 @@ section.page-project section.file .code pre {position:relative;overflow:hidden;} section.page-project section.file .code pre code {line-height:20px;font-family:monospace;} section.page-project section.file .code pre code.lines {position:absolute;top:0;left:0;width:38px;padding:0.5em;opacity:0.2;} section.page-project section.file .code pre code.hljs {margin-left:38px;} -section.page-project section.file .code pre code.differences {position:absolute;top:0;left:38px;padding:0.5em;} -section.page-project section.file .code pre code.differences .value {opacity:0.4;} +section.page-project section.file .code pre code.differences {position:absolute;top:0;left:38px;padding:0.5em;pointer-events:none;} +section.page-project section.file .code pre code.differences.inactive {display:none;} +section.page-project section.file .code pre code.differences .value {visibility:hidden;} section.page-project section.file .code pre code.differences span.removed {display:none;border:1px solid red;} section.page-project section.file .code pre code.differences span.removed .value {display:none;} section.page-project section.file .code pre code.differences span.added {border:1px solid #b0ea23;background:rgba(176, 234, 35, 0.1);} diff --git a/site/views/pages/index/project.jade b/site/views/pages/index/project.jade index 24ecda5..ab6e05a 100644 --- a/site/views/pages/index/project.jade +++ b/site/views/pages/index/project.jade @@ -24,8 +24,11 @@ section.page-project(ng-controller="ProjectController as controller",ng-init="in | {{project.name}} div.always-last-version-toggle(ng-click="always_last_version_toggle_click()",ng-class="always_last_version ? 'active' : 'inactive'") .switch - | always last version - div.mark-all-as-read(ng-click="mark_all_as_read()") + | Always last version + div.show-differences-toggle(ng-click="show_differences_toggle_click()",ng-class="show_differences ? 'active' : 'inactive'") + .switch + | Show differences + div.mark-all-as-read(ng-click="mark_all_as_read_click()") | Mark all as read .aside-tree nav.files-tree-nav @@ -56,7 +59,7 @@ section.page-project(ng-controller="ProjectController as controller",ng-init="in .line= line_index++ code(hljs,hljs-source="version.content") | {{ version.content }} - code.differences(ng-if="version.diff") + code.differences(ng-if="version.diff",ng-class="show_differences ? 'active' : 'inactive'") span(ng-repeat="_difference in version.diff",ng-class="{removed: _difference.removed, added: _difference.added}") span.value | {{ _difference.value }}