From 060dcd71cd8f27cca2c10284792eed0088265af9 Mon Sep 17 00:00:00 2001 From: jonaswinkler <jonas.winkler@jpwinkler.de> Date: Tue, 2 Feb 2021 14:06:16 +0100 Subject: [PATCH] messages, reorganized settings --- src-ui/messages.xlf | 141 +++++++++--------- .../manage/settings/settings.component.html | 33 ++-- 2 files changed, 93 insertions(+), 81 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index d07659793..86198ca7f 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -569,11 +569,18 @@ <context context-type="linenumber">10</context> </context-group> </trans-unit> + <trans-unit id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab" datatype="html"> + <source>Notifications</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">115</context> + </context-group> + </trans-unit> <trans-unit id="99dee94e92dbd9e21a008d4569f9719ed206ae37" datatype="html"> <source>Saved views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">128</context> + <context context-type="linenumber">133</context> </context-group> </trans-unit> <trans-unit id="bbe41ac2ea4a6c00ea941a41b33105048f8e9f13" datatype="html"> @@ -681,109 +688,102 @@ <context context-type="linenumber">98</context> </context-group> </trans-unit> - <trans-unit id="8bcabdf6b16cad0313a86c7e940c5e3ad7f9f8ab" datatype="html"> - <source>Notifications</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">102</context> - </context-group> - </trans-unit> - <trans-unit id="8680abbea249ebe9c2fe35556559c8e1a9eb5841" datatype="html"> - <source>Document processing</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">106</context> - </context-group> - </trans-unit> - <trans-unit id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0" datatype="html"> - <source>Show notifications when new documents are detected</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">109</context> - </context-group> - </trans-unit> - <trans-unit id="e775f4f7c40249d31426ae61a21616a0c9d8e84f" datatype="html"> - <source>Show notifications when document processing completes successfully</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">110</context> - </context-group> - </trans-unit> - <trans-unit id="e3844dd174d8e817ddb551fae28f14ae80ca36b6" datatype="html"> - <source>Show notifications when document processing fails</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">111</context> - </context-group> - </trans-unit> - <trans-unit id="af113f7c9f7e13145c3461f61a1aedf12d57bd71" datatype="html"> - <source>Suppress notifications on dashboard</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">112</context> - </context-group> - </trans-unit> - <trans-unit id="e27bd3804d2936a6897e81c2e52e294490e5e5a8" datatype="html"> - <source>This will suppress all messages about document processing status on the dashboard.</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">112</context> - </context-group> - </trans-unit> <trans-unit id="3863a86cd9e69a61d143d3daf51df44203df4a82" datatype="html"> <source>Bulk editing</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">116</context> + <context context-type="linenumber">102</context> </context-group> </trans-unit> <trans-unit id="c0ac61661c6c326d6e0e00c231b95cf2ac0c6586" datatype="html"> <source>Show confirmation dialogs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">106</context> </context-group> </trans-unit> <trans-unit id="291bbe56ecbe945dcf05580a57d679fa7bd1e06a" datatype="html"> <source>Deleting documents will always ask for confirmation.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">106</context> </context-group> </trans-unit> <trans-unit id="8cfddc13e04f5545ac63f419ef363505d6f78c2e" datatype="html"> <source>Apply on close</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">107</context> + </context-group> + </trans-unit> + <trans-unit id="8680abbea249ebe9c2fe35556559c8e1a9eb5841" datatype="html"> + <source>Document processing</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">118</context> + </context-group> + </trans-unit> + <trans-unit id="2ad4d76b36341c589d94004ad2a213fd4d6f5ca0" datatype="html"> + <source>Show notifications when new documents are detected</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">122</context> + </context-group> + </trans-unit> + <trans-unit id="e775f4f7c40249d31426ae61a21616a0c9d8e84f" datatype="html"> + <source>Show notifications when document processing completes successfully</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">123</context> + </context-group> + </trans-unit> + <trans-unit id="e3844dd174d8e817ddb551fae28f14ae80ca36b6" datatype="html"> + <source>Show notifications when document processing fails</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">124</context> + </context-group> + </trans-unit> + <trans-unit id="af113f7c9f7e13145c3461f61a1aedf12d57bd71" datatype="html"> + <source>Suppress notifications on dashboard</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">125</context> + </context-group> + </trans-unit> + <trans-unit id="e27bd3804d2936a6897e81c2e52e294490e5e5a8" datatype="html"> + <source>This will suppress all messages about document processing status on the dashboard.</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> + <context context-type="linenumber">125</context> </context-group> </trans-unit> <trans-unit id="8cb90334f5dfd7fc67205085f59381e2a334ccfc" datatype="html"> <source>Appears on</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">145</context> </context-group> </trans-unit> <trans-unit id="6717cf1acf04728fc2b7c39f6d3297f8ff15fde5" datatype="html"> <source>Show on dashboard</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">143</context> + <context context-type="linenumber">148</context> </context-group> </trans-unit> <trans-unit id="541bfc5b123b3f8867fd681eaceefb663a811973" datatype="html"> <source>Show in sidebar</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">152</context> </context-group> </trans-unit> <trans-unit id="abba764a7a595d04dc8c3b26e04b3780d4fdb540" datatype="html"> <source>No saved views defined.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> - <context context-type="linenumber">157</context> + <context context-type="linenumber">162</context> </context-group> </trans-unit> <trans-unit id="ef60a738a565f498b858e903e42bc5ffc3cc1299" datatype="html"> @@ -980,35 +980,42 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">107</context> </context-group> </trans-unit> <trans-unit id="408cb6073e60c5d966296a3207fc596adca75e01" datatype="html"> <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">149</context> </context-group> </trans-unit> - <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029" datatype="html"> - <source>Misc</source> + <trans-unit id="321e4419a943044e674beb55b8039f42a9761ca5" datatype="html"> + <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">155</context> </context-group> </trans-unit> <trans-unit id="fcfd4675b4c90f08d18d3abede9a9a4dff4cfdc7" datatype="html"> <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">162</context> </context-group> </trans-unit> <trans-unit id="355a222236bc01b9a8cd3cb9ecf76891125aed69" datatype="html"> <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">174</context> + <context context-type="linenumber">170</context> + </context-group> + </trans-unit> + <trans-unit id="ea3a452c5238897cabc5781308cceb2d37dcf258" datatype="html"> + <source>Suggest an idea</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> + <context context-type="linenumber">176</context> </context-group> </trans-unit> <trans-unit id="af665f8de8fabe306aaf27443957e69bcbbce63c" datatype="html"> @@ -1022,14 +1029,14 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">87</context> </context-group> </trans-unit> <trans-unit id="dca5bf9344a759fa5a07f1b21f50286ec242ba44" datatype="html"> <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">101</context> </context-group> </trans-unit> <trans-unit id="5195932016807797291" datatype="html"> diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index b95b56133..affe2f0b0 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -99,20 +99,6 @@ </div> </div> - <h4 class="mt-4" i18n>Notifications</h4> - - <div class="form-row form-group"> - <div class="col-md-3 col-form-label"> - <span i18n>Document processing</span> - </div> - <div class="col"> - <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check> - <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check> - <app-input-check i18n-title title="Show notifications when document processing fails" formControlName="notificationsConsumerFailed"></app-input-check> - <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all messages about document processing status on the dashboard."></app-input-check> - </div> - </div> - <h4 class="mt-4" i18n>Bulk editing</h4> <div class="form-row form-group"> @@ -124,7 +110,26 @@ </ng-template> </li> + <li [ngbNavItem]="2"> + <a ngbNavLink i18n>Notifications</a> + <ng-template ngbNavContent> + + <h4 i18n>Document processing</h4> + + <div class="form-row form-group"> + <div class="offset-md-3 col"> + <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check> + <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check> + <app-input-check i18n-title title="Show notifications when document processing fails" formControlName="notificationsConsumerFailed"></app-input-check> + <app-input-check i18n-title title="Suppress notifications on dashboard" formControlName="notificationsConsumerSuppressOnDashboard" i18n-hint hint="This will suppress all messages about document processing status on the dashboard."></app-input-check> + </div> + </div> + + </ng-template> + </li> + + <li [ngbNavItem]="3"> <a ngbNavLink i18n>Saved views</a> <ng-template ngbNavContent>