yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v8: Change button style for "create package" and "show more" (in the log viewer) (#6428)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2019-09-29 15:16:50 +02:00
committed by Sebastiaan Janssen
parent fa0bdd5aaf
commit 795b64dadd
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
View File

@@ -4,6 +4,7 @@
function LogViewerOverviewController($q, $location, $timeout, logViewerResource, navigationService) {
var vm = this;
vm.loading = false;
vm.canLoadLogs = false;
vm.searches = [];
@@ -50,6 +51,7 @@
vm.searchLogQuery = searchLogQuery;
vm.findMessageTemplate = findMessageTemplate;
vm.searchErrors = searchErrors;
vm.showMore = showMore;
function preFlightCheck(){
vm.loading = true;
@@ -66,6 +68,9 @@
});
}
function showMore() {
vm.commonLogMessagesCount += 10;
}
function init() {

23
src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
View File

@@ -53,17 +53,22 @@
<em>Total Unique Message types</em>: {{ vm.commonLogMessages.length }}
<table class="table table-hover">
<tbody>
<tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
<td>
{{ template.MessageTemplate }}
</td>
<td>
{{ template.Count }}
</td>
</tr>
<tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
<td>
{{ template.MessageTemplate }}
</td>
<td>
{{ template.Count }}
</td>
</tr>
</tbody>
</table>
<a class="btn btn-primary" ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length" ng-click="vm.commonLogMessagesCount = vm.commonLogMessagesCount +10">Show More</a>
<umb-button ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length"
button-style="action"
type="button"
action="vm.showMore()"
label="Show More">
</umb-button>
</umb-box-content>
</umb-box>
</div>

1
src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
View File

@@ -88,7 +88,6 @@
vm.deleteSavedSearch = deleteSavedSearch;
vm.back = back;
function init() {
//If we have a Querystring set for lq (log query)

4
src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
View File

@@ -87,9 +87,9 @@
</umb-editor-sub-header>
</form>
<div class=" ng-if="!vm.loading">
<div ng-if="!vm.loading">
<div class="">
<div>
<!-- Loader for the main logs content when paging -->
<umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
View File

@@ -4,7 +4,7 @@
<umb-editor-sub-header-content-left>
<umb-button
button-style="success"
button-style="action"
type="button"
action="vm.createPackage()"
label="Create package"