Merge pull request #4730 from codewithvk/private/codewithvk/iframe_ui

fix(setting-iframe): move iframe to bottom and set height to 2000px

Author: juliusknorr

src/components/AdminSettings.vue

@@ -217,14 +217,6 @@
 			</div>
 		</NcModal>
 
-		<CoolFrame v-if="tokenGenerated"
-			class="section"
-			:iframe-type="'admin'"
-			:iframe-url="settings.setting_iframe_url"
-			:access-token="accessToken"
-			:access-token-t-t-l="accessTokenTTL"
-			:wopi-setting-base-url="wopiSettingBaseUrl" />
-
 		<div v-if="isSetup" id="advanced-settings" class="section">
 			<h2>{{ t('richdocuments', 'Advanced settings') }}</h2>
 			<SettingsCheckbox :value="isOoxml"
@@ -414,6 +406,14 @@
 		</div>
 
 		<GlobalTemplates v-if="isSetup" />
+
+		<CoolFrame v-if="tokenGenerated"
+			class="section"
+			:iframe-type="'admin'"
+			:iframe-url="settings.setting_iframe_url"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 	</div>
 </template>
 

src/components/CoolFrame.vue

@@ -86,7 +86,7 @@ export default {
   .cool-frame-iframe {
     width: 100%;
     border: none;
-	height: 60vh;
+	height: 2000px;
 	overflow-y: auto;
   }
   </style>

src/components/PersonalSettings.vue

@@ -34,14 +34,6 @@
 			</em>
 		</p>
 
-		<!-- user settings iframe  -->
-		<CoolFrame v-if="tokenGenerated"
-			:iframe-type="'user'"
-			:iframe-url="settingIframeUrl"
-			:access-token="accessToken"
-			:access-token-t-t-l="accessTokenTTL"
-			:wopi-setting-base-url="wopiSettingBaseUrl" />
-
 		<!-- Zotero -->
 		<div class="zotero-section">
 			<p><strong>{{ t('richdocuments', 'Zotero') }}</strong></p>
@@ -118,6 +110,13 @@
 				</em>
 			</p>
 		</div>
+		<!-- user settings iframe  -->
+		<CoolFrame v-if="tokenGenerated"
+			:iframe-type="'user'"
+			:iframe-url="settingIframeUrl"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 	</NcSettingsSection>
 </template>