lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix_introduce_consistent_button_position_in_change_dialogs

Browse Source
This commit is contained in:
Melanie Retter
2016-06-03 13:50:14 +02:00
parent 51ab973e6b 4821561bbe
commit 7d8609b7df
20 changed files with 1128 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
View File

@@ -10,7 +10,7 @@
@mixin others {
//Style to display the pending action count
.unread {
.unread, .error-count {
@include valo-badge-style;
position: absolute;
pointer-events: none;
@@ -21,6 +21,15 @@
border-radius: $v-border-radius;
color: $widget-bg;
}
.error-count {
top: round($v-unit-size / -5);
right: round($v-unit-size / 1.9);
}
.error-count-color{
@include valo-gradient($color: $red-color);
}
//Deployment view - Style of count message
.v-caption-count-msg-box {

4
hawkbit-ui/src/main/resources/messages.properties
View File

@@ -86,6 +86,7 @@ caption.cancel.action.confirmbox = Confirm action cancel
caption.forcequit.action.confirmbox = Confirm force quit action
caption.forced.datefield = Force update at time
caption.force.action.confirmbox = Confirm Force Active Action
caption.confirm.abort.action = Confirm abort action
caption.filter.delete.confirmbox = Confirm Filter Delete Action
@@ -321,8 +322,11 @@ message.duplicate.filename = Duplicate file name
message.swModule.deleted = {0} Software module(s) deleted
message.upload.failed = Streaming Failed
message.uploadedfile.size.exceeded = File size exceeded .Allowed size {0} bytes
message.uploadedfile.aborted = File upload aborted
message.file.not.found = File not found
message.artifact.deleted =Artifact with file {0} deleted successfully
message.abort.upload = Are you sure that you want to abort the upload?
upload.swModuleTable.header = Software module

6
hawkbit-ui/src/main/resources/messages_de.properties
View File

@@ -85,8 +85,9 @@ caption.forced.datefield = Force update at time
caption.force.action.confirmbox = Confirm Force Active Action
caption.filter.simple = Simple Filter
caption.filter.custom = Custom Filter
caption.filter.delete.confirmbox = Confirm Filter Delete Action
caption.confirm.abort.action = Confirm abort action
# Labels prefix with - label
label.dist.details.type = Type :
@@ -319,8 +320,11 @@ message.swModule.deleted = {0} Software module(s) deleted
message.error.missing.tagname = Please select tag name
message.upload.failed = Streaming Failed
message.uploadedfile.size.exceeded = File size exceeded .Allowed size {0} bytes
message.uploadedfile.aborted = File upload aborted
message.file.not.found = File not found
message.artifact.deleted =Artifact with file {0} deleted successfully
message.abort.upload = Are you sure that you want to abort the upload?
upload.swModuleTable.header = Software module

5
hawkbit-ui/src/main/resources/messages_en.properties
View File

@@ -85,8 +85,8 @@ caption.soft.delete.confirmbox = Confirm Software Module Delete Action
caption.cancel.action.confirmbox = Confirm action cancellation
caption.forced.datefield = Force update at time
caption.force.action.confirmbox = Confirm Force Active Action
caption.filter.delete.confirmbox = Confirm Filter Delete Action
caption.confirm.abort.action = Confirm abort action
# Labels prefix with - label
label.dist.details.type = Type :
@@ -313,7 +313,10 @@ message.duplicate.filename = Duplicate file name
message.swModule.deleted = {0} Software module(s) deleted
message.upload.failed = Streaming Failed
message.uploadedfile.size.exceeded = File size exceeded .Allowed size {0} bytes
message.uploadedfile.aborted = File upload aborted
message.file.not.found = File not found
message.abort.upload = Are you sure that you want to abort the upload?
upload.swModuleTable.header = Software module
upload.selectedfile.name = file selected for upload