pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issues related to message displaying in settings

Browse Source
This commit is contained in:
huangjx
2021-11-19 14:16:11 +08:00
parent e3fd6d3bfc
commit f983d18965
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/css/settings.scss
View File

@@ -1,4 +1,5 @@
.ncdownloader-personal-settings,.ncdownloader-admin-settings { .ncdownloader-personal-settings,
.ncdownloader-admin-settings {
position: relative; position: relative;
#ncdownloader-message-banner { #ncdownloader-message-banner {
@@ -12,14 +13,15 @@
text-shadow : 0 1px 0 rgba(255, 255, 255, .2); text-shadow : 0 1px 0 rgba(255, 255, 255, .2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
box-shadow : inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05); box-shadow : inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
width : 100%;
background-color: #dff0d8;
} }
#ncdownloader-message-banner.success, #ncdownloader-message-banner.success,
.message-banner.success { .message-banner.success {
color : #3c763d; color : #799479;
background-color: #dff0d8; background-color: #dff0d8;
border-color : #d6e9c6; border-color : #d6e9c6;
width : 100%;
} }
#ncdownloader-message-banner.error, #ncdownloader-message-banner.error,
@@ -27,7 +29,6 @@
color : #a94442; color : #a94442;
background-color: #f2dede; background-color: #f2dede;
border-color : #ebccd1; border-color : #ebccd1;
width : 100%;
} }
} }

2
src/lib/msg.js
View File

@@ -23,8 +23,8 @@ export default {
*/ */
startAction(selector, message) { startAction(selector, message) {
let el = document.querySelector(selector); let el = document.querySelector(selector);
el.textContent = message;
el.style.removeProperty("display") el.style.removeProperty("display")
el.textContent = message;
}, },
/** /**

6
src/settings.js
View File

@@ -42,11 +42,11 @@ window.addEventListener('DOMContentLoaded', function () {
return; return;
} }
Http.getInstance(url).setData(data).setHandler(function (data) { Http.getInstance(url).setData(data).setHandler(function (data) {
if (data.hasOwnProperty("error")) if (data.hasOwnProperty("error")) {
OC_msg.finishedError('#ncdownloader-message-banner', data.error); OC_msg.finishedError('#ncdownloader-message-banner', data.error);
else if (data.hasOwnProperty("message")) } else if (data.hasOwnProperty("message")) {
OC_msg.finishedSuccess('#ncdownloader-message-banner', data.message); OC_msg.finishedSuccess('#ncdownloader-message-banner', data.message);
else { } else {
OC_msg.finishedSuccess('#ncdownloader-message-banner', "DONE"); OC_msg.finishedSuccess('#ncdownloader-message-banner', "DONE");
} }
}).send(); }).send();

2
templates/settings/Admin.php
View File

@@ -4,7 +4,7 @@ style("ncdownloader", "settings");
extract($_); extract($_);
?> ?>
<div class="ncdownloader-admin-settings"> <div class="ncdownloader-admin-settings">
<div id="ncdownloader-message-banner"></div> <div id="ncdownloader-message-banner" style="display: none;"></div>
<form id="ncdownloader" class="section"> <form id="ncdownloader" class="section">
<h2>NCDownloader admin Settings</h2> <h2>NCDownloader admin Settings</h2>
<div id="ncd_rpctoken_settings" path="<?php print $path;?>"> <div id="ncd_rpctoken_settings" path="<?php print $path;?>">

2
templates/settings/Personal.php
View File

@@ -6,7 +6,7 @@ extract($_);
$time_map = array('i' => 'minutes', 'h' => 'hours', 'w' => 'weeks', 'd' => 'days', 'y' => 'years'); $time_map = array('i' => 'minutes', 'h' => 'hours', 'w' => 'weeks', 'd' => 'days', 'y' => 'years');
?> ?>
<div class="ncdownloader-personal-settings"> <div class="ncdownloader-personal-settings">
<div id="ncdownloader-message-banner"></div> <div id="ncdownloader-message-banner" style="display: none;"></div>
<div id="ncdownloader-settings-form" class="section"> <div id="ncdownloader-settings-form" class="section">
<div class="ncdownloader-general-settings"> <div class="ncdownloader-general-settings">
<h2 class="title"> <h2 class="title">