diff options
| author | Devlin Junker <devlin.junker@gmail.com> | 2023-10-16 13:13:03 -0700 |
|---|---|---|
| committer | Benjamin Brahmer <info@b-brahmer.de> | 2023-10-19 08:26:39 +0200 |
| commit | 9cab23574fbaf59c07dc3f187f0490f298dd9e75 (patch) | |
| tree | 05e5460e590dc70c8289df67fdd1e0f22ce28326 | |
| parent | ab4f941028e27ced237b061fc9aae5d1eb3b35a6 (diff) | |
fix bug using php template for warning message
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
| -rw-r--r-- | src/App.vue | 16 | ||||
| -rw-r--r-- | src/components/feed-display/FeedItemRow.vue | 2 | ||||
| -rw-r--r-- | src/main.js | 6 | ||||
| -rw-r--r-- | templates/part.content.warnings.php | 66 |
4 files changed, 26 insertions, 64 deletions
diff --git a/src/App.vue b/src/App.vue index c78609414..5b818d6d8 100644 --- 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 index 8742dff6a..4bea3d45f 100644 --- 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 index 9a70d470f..c7314d17b 100644 --- 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 index f68933dba..db9b2f218 100644 --- 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 }; ?> |