Overview
Comment:Fix issues with background
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev | 1.0.0-beta8
Files: files | file ages | folders
SHA1: 8bfc828da2454c6c4df1b9438d6fa14053b6da26
User & Date: bohwaz on 2020-11-25 22:26:03
Other Links: branch diff | manifest | tags
Context
2020-11-25
22:27
Fix year is always current_year check-in: 15ae918267 user: bohwaz tags: dev, 1.0.0-beta8
22:26
Fix issues with background check-in: 8bfc828da2 user: bohwaz tags: dev, 1.0.0-beta8
22:11
Fix last minute issues check-in: 3a8f287453 user: bohwaz tags: dev, 1.0.0-beta8
Changes

Modified src/www/admin/static/scripts/color_helper.js from [39797c2e5c] to [22a65be414].

72
73
74
75
76
77
78


79









80
81
82
83
84
85
86
			delete canvas2;
			delete canvas;
			delete ctx;
			delete img;
		};

		var bg = $('#f_image_fond');


		img.src = (bg.value && bg.value != '0')  ? 'data:image/png;base64,' + bg.value : bg.getAttribute('data-source');









	}

	/**
	 * Imports a new image and makes it black and white
	 */
	function importBackgroundImage(data, callback)
	{







>
>
|
>
>
>
>
>
>
>
>
>







72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
			delete canvas2;
			delete canvas;
			delete ctx;
			delete img;
		};

		var bg = $('#f_image_fond');

		if (bg.value) {
			img.src = 'data:image/png;base64,' + bg.value;
		}
		else if (bg.dataset.source) {
			img.src = 'data:image/png;base64,' + bg.dataset.source;
		}
		else {
			img.src = bg.dataset.default;
		}

		console.log(img.src);
	}

	/**
	 * Imports a new image and makes it black and white
	 */
	function importBackgroundImage(data, callback)
	{
178
179
180
181
182
183
184

185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
		var bg = $('#f_background');
		bg.onchange = () => {
			if (!bg.files.length) return;

			var reader = new FileReader;
			reader.onload = (e) => {
				importBackgroundImage(e.target.result, applyColors);

				bg.value = '';
			};
			reader.readAsDataURL(bg.files[0]);
		};

		var reset_btn = document.createElement('button');
		reset_btn.className = 'resetButton icn-btn';
		reset_btn.type = 'button';
		reset_btn.innerHTML = 'RàZ';

		reset_btn.onclick = () => {
			$('#f_image_fond').dataset.source = $('#f_image_fond').dataset.default;
			$('#f_image_fond').value = '';

			var input = $('#f_couleur2');
			if (input.getAttribute('placeholder') == input.value) {
				return;
			}

			applyColors();
		};

		bg.parentNode.insertBefore(reset_btn, bg.nextSibling);
	});
})();







>











|

|
<
<
<
<







189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210




211
212
213
214
215
216
217
		var bg = $('#f_background');
		bg.onchange = () => {
			if (!bg.files.length) return;

			var reader = new FileReader;
			reader.onload = (e) => {
				importBackgroundImage(e.target.result, applyColors);
				bg.disabled = true;
				bg.value = '';
			};
			reader.readAsDataURL(bg.files[0]);
		};

		var reset_btn = document.createElement('button');
		reset_btn.className = 'resetButton icn-btn';
		reset_btn.type = 'button';
		reset_btn.innerHTML = 'RàZ';

		reset_btn.onclick = () => {
			$('#f_image_fond').dataset.source = '';
			$('#f_image_fond').value = '';
			bg.disabled = false;





			applyColors();
		};

		bg.parentNode.insertBefore(reset_btn, bg.nextSibling);
	});
})();

Modified src/www/admin/static/styles/03-forms.css from [3c04c8c698] to [aff7eb3d22].

220
221
222
223
224
225
226






227
228
229
230
231
232
233

input[readonly], input.disabled, input[disabled], textarea[disabled], select[disabled] {
    cursor: not-allowed;
    color: #666;
    background-color: #eee;
    border-color: #999;
}







select, input[size], input[type=color], button, input[type=button], input[type=submit], input[type=number] {
    min-width: 0;
}

/* Radio button lists (eg. new transaction) */
form .radio-btn {







>
>
>
>
>
>







220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239

input[readonly], input.disabled, input[disabled], textarea[disabled], select[disabled] {
    cursor: not-allowed;
    color: #666;
    background-color: #eee;
    border-color: #999;
}

input[disabled]:hover, input[readonly]:hover {
    background-color: unset;
    color: unset;
    border-color: unset;
}

select, input[size], input[type=color], button, input[type=button], input[type=submit], input[type=number] {
    min-width: 0;
}

/* Radio button lists (eg. new transaction) */
form .radio-btn {