fix bug using php template for warning message

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
nextcloud · Oct 16, 2023 · a240528 · a240528
1 parent b002ba6
commit a240528
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 64 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -3,6 +3,16 @@
 		<div v-if="app.error" id="warning-box">
 			<div>
 				{{ app.error }}
+
+				<ul v-for="link of app.error.links" :key="link.url">
+					<li>
+						<a :href="link.url"
+							target="_blank"
+							rel="noreferrer">
+							{{ link.text }}
+						</a>
+					</li>
+				</ul>
 			</div>
 			<div>
 				<span style="cursor: pointer;padding: 10px;font-weight: bold;" @click="removeError()">X</span>
@@ -104,6 +114,12 @@ export default Vue.extend({
 		display: flex;
 	}
 
+	#warning-box a {
+		color: #3a84e4;
+		text-decoration: underline;
+		font-size: small;
+	}
+
 	.route-container {
 		height: 100%;
 	}

diff --git a/src/components/feed-display/FeedItemRow.vue b/src/components/feed-display/FeedItemRow.vue
@@ -247,6 +247,6 @@ export default Vue.extend({
 	}
 
 	.feed-item-row .button-container .eye-check-icon {
-		color: var(--color-primary-light);
+		color: var(--color-placeholder-dark);
 	}
 </style>
diff --git a/src/main.js b/src/main.js
@@ -41,7 +41,7 @@ Vue.config.errorHandler = handleErrors
 export default new Vue({
 	router,
 	store,
-	el: '#q-app',
+	el: '#content',
 	render: (h) => h(App),
 })
 
@@ -51,4 +51,6 @@ export default new Vue({
 function closeCronWarning() {
 	document.getElementById('cron-warning').style.display = 'none'
 }
-document.getElementById('close-cron-warning').onclick = closeCronWarning
+// document.getElementById('close-cron-warning').onclick = closeCronWarning
+
+window.store = store
diff --git a/templates/part.content.warnings.php b/templates/part.content.warnings.php
@@ -1,62 +1,6 @@
-<?php if ($_['warnings']['improperlyConfiguredCron']) { ?>
-    <style>
-        #cron-warning {
-            position: absolute;
-            right: 30px;
-            top: 120px;
-            z-index: 5;
-            padding: 5px;
-            background-color: var(--color-main-background);
-            color: var(--color-main-text);
-            box-shadow: 0 0 6px 0 var(--color-box-shadow);
-            border-radius: var(--border-radius);
-            display: flex;
-            max-width: 85%
-        }
-
-        #cron-warning a {
-            color: #3a84e4;
-            text-decoration: underline;
-            font-size: small;
-        }
-
-        #close-cron-warning {
-            padding: 10px;
-            font-weight: bold;
-            cursor: pointer;
-        }
-
-        #content {
-            margin-top: 0px;
-        }
-    </style>
-
-    <div id="cron-warning">
-        <div style="<?= $_['nc_major_version'] >= 25 ? 'padding: 12px;' : ''; ?>">
-            <p><?php p($l->t('Ajax or webcron mode detected! Your feeds will not be updated!')); ?></p>
-            <ul>
-                <li>
-                    <a href="https://docs.nextcloud.org/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#cron"
-                    target="_blank"
-                    rel="noreferrer">
-                        <?php
-                        p($l->t('How to set up the operating system cron'));
-                        ?>
-                    </a>
-                </li>
-                <li>
-                    <a href="https://github.com/nextcloud/news-updater"
-                    target="_blank"
-                    rel="noreferrer">
-                        <?php
-                        p($l->t('Install and set up a faster parallel updater that uses the News app\'s update API'));
-                        ?>
-                    </a>
-                </li>
-            </ul>
-        </div>
-        <div>
-            <span id="close-cron-warning">X</span>
-        </div>
-    </div>
+<?php if ($_['warnings']['improperlyConfiguredCron']) { 
+
+    script('news', 'test')    
+?>
+<div></div>
 <?php }; ?>