diff --git a/app/assets/stylesheets/steps/step.scss b/app/assets/stylesheets/steps/step.scss index 44f940d8b..82f94bce4 100644 --- a/app/assets/stylesheets/steps/step.scss +++ b/app/assets/stylesheets/steps/step.scss @@ -132,13 +132,35 @@ .drop-message { display: flex; + flex-direction: column; } - *:not(.drop-message) { + > *:not(.drop-message) { opacity: 0; pointer-events: none; } } + + .storage-usage { + @include font-small; + color: $color-black; + + .progress-container { + background-color: $color-white; + border-radius: 2px; + height: 4px; + margin: 1em 0; + overflow: hidden; + position: relative; + + .progress-bar { + background-color: $brand-primary; + height: 100%; + position: relative; + transition: 1s $timing-function-sharp; + } + } + } } .step-element-header { diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue index 66484c22f..31eeff910 100644 --- a/app/javascript/vue/protocol/step.vue +++ b/app/javascript/vue/protocol/step.vue @@ -9,6 +9,7 @@ >
{{ i18n.t('protocols.steps.drop_message', {position: step.attributes.position + 1}) }} +
{{ i18n.t("protocols.steps.attachments.file_modal.drag_zone_description") }}
+
{{ i18n.t("protocols.steps.attachments.file_modal.drag_zone_notification", {position: step.attributes.position + 1}) }} @@ -69,6 +70,8 @@
diff --git a/app/serializers/step_serializer.rb b/app/serializers/step_serializer.rb index 9e5b8bbc5..bc9a8538e 100644 --- a/app/serializers/step_serializer.rb +++ b/app/serializers/step_serializer.rb @@ -6,7 +6,8 @@ class StepSerializer < ActiveModel::Serializer include CommentHelper attributes :name, :position, :completed, :urls, :assets_view_mode, :assets_order, - :marvinjs_enabled, :marvinjs_context, :wopi_enabled, :wopi_context, :comments_count, :unseen_comments + :marvinjs_enabled, :marvinjs_context, :wopi_enabled, :wopi_context, :comments_count, :unseen_comments, + :storage_limit def marvinjs_enabled MarvinJsService.enabled? @@ -42,6 +43,10 @@ class StepSerializer < ActiveModel::Serializer end end + def storage_limit + nil + end + def assets_order object.current_view_state(@instance_options[:user]).state.dig('assets', 'sort') end