|
|
@@ -1,5 +1,5 @@
|
|
|
aside.change-list(
|
|
|
- ng-if="history.isV2"
|
|
|
+ ng-if="history.isV2 && history.viewMode === HistoryViewModes.POINT_IN_TIME"
|
|
|
ng-controller="HistoryV2ListController"
|
|
|
)
|
|
|
history-entries-list(
|
|
|
@@ -12,6 +12,89 @@ aside.change-list(
|
|
|
on-entry-select="handleEntrySelect(selectedEntry)"
|
|
|
)
|
|
|
|
|
|
+aside.change-list(
|
|
|
+ ng-if="history.isV2 && history.viewMode === HistoryViewModes.COMPARE"
|
|
|
+ ng-controller="HistoryListController"
|
|
|
+ infinite-scroll="loadMore()"
|
|
|
+ infinite-scroll-disabled="history.loading || history.atEnd"
|
|
|
+ infinite-scroll-initialize="ui.view == 'history'"
|
|
|
+)
|
|
|
+ .infinite-scroll-inner
|
|
|
+ ul.list-unstyled(
|
|
|
+ ng-class="{\
|
|
|
+ 'hover-state': history.hoveringOverListSelectors\
|
|
|
+ }"
|
|
|
+ )
|
|
|
+ li.change(
|
|
|
+ ng-repeat="update in history.updates"
|
|
|
+ ng-class="{\
|
|
|
+ 'first-in-day': update.meta.first_in_day,\
|
|
|
+ 'selected': update.inSelection,\
|
|
|
+ 'selected-to': update.selectedTo,\
|
|
|
+ 'selected-from': update.selectedFrom,\
|
|
|
+ 'hover-selected': update.inHoverSelection,\
|
|
|
+ 'hover-selected-to': update.hoverSelectedTo,\
|
|
|
+ 'hover-selected-from': update.hoverSelectedFrom,\
|
|
|
+ }"
|
|
|
+ ng-controller="HistoryListItemController"
|
|
|
+ )
|
|
|
+
|
|
|
+ div.day(ng-show="update.meta.first_in_day") {{ update.meta.end_ts | relativeDate }}
|
|
|
+
|
|
|
+ div.selectors
|
|
|
+ div.range
|
|
|
+ form
|
|
|
+ input.selector-from(
|
|
|
+ type="radio"
|
|
|
+ name="fromVersion"
|
|
|
+ ng-model="update.selectedFrom"
|
|
|
+ ng-value="true"
|
|
|
+ ng-mouseover="mouseOverSelectedFrom()"
|
|
|
+ ng-mouseout="mouseOutSelectedFrom()"
|
|
|
+ ng-show="update.afterSelection || update.inSelection"
|
|
|
+ )
|
|
|
+ form
|
|
|
+ input.selector-to(
|
|
|
+ type="radio"
|
|
|
+ name="toVersion"
|
|
|
+ ng-model="update.selectedTo"
|
|
|
+ ng-value="true"
|
|
|
+ ng-mouseover="mouseOverSelectedTo()"
|
|
|
+ ng-mouseout="mouseOutSelectedTo()"
|
|
|
+ ng-show="update.beforeSelection || update.inSelection"
|
|
|
+ )
|
|
|
+
|
|
|
+ div.description(ng-click="select()")
|
|
|
+ div.time {{ update.meta.end_ts | formatDate:'h:mm a' }}
|
|
|
+ div.action.action-edited(ng-if="history.isV2 && update.pathnames.length > 0")
|
|
|
+ | Edited
|
|
|
+ div.docs(ng-repeat="pathname in update.pathnames")
|
|
|
+ .doc {{ pathname }}
|
|
|
+ div.docs(ng-repeat="project_op in update.project_ops")
|
|
|
+ div(ng-if="project_op.rename")
|
|
|
+ .action Renamed
|
|
|
+ .doc {{ project_op.rename.pathname }} → {{ project_op.rename.newPathname }}
|
|
|
+ div(ng-if="project_op.add")
|
|
|
+ .action Created
|
|
|
+ .doc {{ project_op.add.pathname }}
|
|
|
+ div(ng-if="project_op.remove")
|
|
|
+ .action Deleted
|
|
|
+ .doc {{ project_op.remove.pathname }}
|
|
|
+ div.users
|
|
|
+ div.user(ng-repeat="update_user in update.meta.users")
|
|
|
+ .color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
|
|
|
+ .color-square(ng-if="update_user == null", ng-style="{'background-color': 'hsl(100, 70%, 50%)'}")
|
|
|
+ .name(ng-if="update_user && update_user.id != user.id" ng-bind="displayName(update_user)")
|
|
|
+ .name(ng-if="update_user && update_user.id == user.id") You
|
|
|
+ .name(ng-if="update_user == null") #{translate("anonymous")}
|
|
|
+ div.user(ng-if="update.meta.users.length == 0")
|
|
|
+ .color-square(style="background-color: hsl(100, 100%, 50%)")
|
|
|
+ span #{translate("anonymous")}
|
|
|
+
|
|
|
+ .loading(ng-show="history.loading")
|
|
|
+ i.fa.fa-spin.fa-refresh
|
|
|
+ | #{translate("loading")}...
|
|
|
+
|
|
|
script(type="text/ng-template", id="historyEntriesListTpl")
|
|
|
.history-entries(
|
|
|
infinite-scroll="$ctrl.loadEntries()"
|
|
|
@@ -45,29 +128,6 @@ script(type="text/ng-template", id="historyEntryTpl")
|
|
|
|
|
|
time.history-entry-day(ng-if="::$ctrl.entry.meta.first_in_day") {{ ::$ctrl.entry.meta.end_ts | relativeDate }}
|
|
|
|
|
|
- //- div.selectors
|
|
|
- //- div.range
|
|
|
- //- form
|
|
|
- //- input.selector-from(
|
|
|
- //- type="radio"
|
|
|
- //- name="fromVersion"
|
|
|
- //- ng-model="$ctrl.entry.selectedFrom"
|
|
|
- //- ng-value="true"
|
|
|
- //- ng-mouseover="mouseOverSelectedFrom()"
|
|
|
- //- ng-mouseout="mouseOutSelectedFrom()"
|
|
|
- //- ng-show="$ctrl.entry.afterSelection || $ctrl.entry.inSelection"
|
|
|
- //- )
|
|
|
- //- form
|
|
|
- //- input.selector-to(
|
|
|
- //- type="radio"
|
|
|
- //- name="toVersion"
|
|
|
- //- ng-model="$ctrl.entry.selectedTo"
|
|
|
- //- ng-value="true"
|
|
|
- //- ng-mouseover="mouseOverSelectedTo()"
|
|
|
- //- ng-mouseout="mouseOutSelectedTo()"
|
|
|
- //- ng-show="$ctrl.entry.beforeSelection || $ctrl.entry.inSelection"
|
|
|
- )
|
|
|
-
|
|
|
.history-entry-details(ng-click="$ctrl.onSelect({ selectedEntry: $ctrl.entry })")
|
|
|
ol.history-entry-changes
|
|
|
li.history-entry-change(
|
Paulo Reis