Merge pull request #1429 from nextcloud/register-dlg

Registration Dlg fixes and optimizations

src/js/assets/scss/hacks.scss

@@ -2,13 +2,10 @@
 	&:not(&--large):not(&--full) .modal-container {
 		width: initial !important;
 		height: initial !important;
+		overflow: auto !important;
 	}
 }
 
-.modal-wrapper .modal-container[data-v-a2e1babe] {
-	overflow: auto !important;
-}
-
 .app-sidebar__tab {
 	overflow: initial !important;
 }
@@ -18,7 +15,6 @@
 	overflow-y: initial !important;
 }
 
-
 .mx-datepicker-main, .mx-datepicker-popup {
 	right: 0 !important;
 	left: auto !important;

src/js/components/Base/PublicRegisterModal.vue

@@ -23,17 +23,12 @@
 <template>
 	<Modal v-show="modal" :can-close="false">
 		<div class="modal__content">
-			<h2 class="modal__title">
+			<!-- <h2 class="modal__title">
 				{{ t('polls', 'Public poll') }}
-			</h2>
+			</h2> -->
 			<div class="modal__registration">
-				<div class="registration__login">
-					<h2> {{ t('polls', 'Do you want to login?') }} </h2>
-					<ButtonDiv :title="t('polls', 'Login')" @click="login()" />
-				</div>
-
 				<div class="registration__registration">
-					<h2>{{ t('polls', 'Participate in public poll!') }}</h2>
+					<h2>{{ t('polls', 'Public participation') }}</h2>
 					<div class="section__username">
 						<h3>{{ t('polls', 'To participate, tell us how we can call you!') }}</h3>
 						<input ref="userName" v-model="userName" :class="userNameCheckStatus"
@@ -59,6 +54,17 @@
 							@click="submitRegistration" />
 					</div>
 				</div>
+
+				<div class="registration__login">
+					<h2> {{ t('polls', 'You are a registered user of this site?') }} </h2>
+					<ButtonDiv :title="t('polls', 'Login')" @click="login()" />
+					<div>
+						{{ t('polls', 'As a regular user of this site, you can participate with your internal identity after logging in.') }}
+					</div>
+					<div>
+						{{ t('polls', 'Otherwise participate publicly.') }}
+					</div>
+				</div>
 			</div>
 		</div>
 	</Modal>
@@ -280,7 +286,7 @@ export default {
 			display: flex;
 			flex-direction: column;
 			flex: 1 auto;
-			min-width: 240px;
+			min-width: 140px;
 			padding: 24px;
 			border-top: 1px solid;
 			border-right: 1px solid;