csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fix ajax screen position + rename fleet list page

Browse Source
This commit is contained in:
jr-k 2024-02-27 12:59:40 +01:00
parent 974d430edf
commit ca444f4c52
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/www/js/fleet.js
View File

@ -51,7 +51,7 @@ jQuery(document).ready(function ($) {
$(document).on('change', 'input[type=checkbox]', function () { $(document).on('change', 'input[type=checkbox]', function () {
$.ajax({ $.ajax({
url: 'fleet/screen/toggle', url: '/fleet/screen/toggle',
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},
data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}), data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}),
method: 'POST', method: 'POST',

2
data/www/js/slideshow.js
View File

@ -51,7 +51,7 @@ jQuery(document).ready(function ($) {
$(document).on('change', 'input[type=checkbox]', function () { $(document).on('change', 'input[type=checkbox]', function () {
$.ajax({ $.ajax({
url: 'slideshow/slide/toggle', url: '/slideshow/slide/toggle',
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},
data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}), data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}),
method: 'POST', method: 'POST',

3
obscreen.py
View File

@ -81,9 +81,10 @@ def inject_global_vars():
PlayerController(app, LANGDICT, slide_manager) PlayerController(app, LANGDICT, slide_manager)
SlideshowController(app, LANGDICT, slide_manager) SlideshowController(app, LANGDICT, slide_manager)
FleetController(app, LANGDICT, screen_manager)
SysinfoController(app, LANGDICT) SysinfoController(app, LANGDICT)
if config['fleet_enabled']:
FleetController(app, LANGDICT, screen_manager)
@app.errorhandler(404) @app.errorhandler(404)
def not_found(e): def not_found(e):

8
src/controller/FleetController.py
View File

@ -13,14 +13,14 @@ class FleetController:
self.register() self.register()
def register(self): def register(self):
self._app.add_url_rule('/fleet', 'fleet', self.fleet, methods=['GET']) self._app.add_url_rule('/fleet/screen/list', 'fleet_screen_list', self.fleet_screen_list, methods=['GET'])
self._app.add_url_rule('/fleet/screen/add', 'fleet_screen_add', self.fleet_screen_add, methods=['POST']) self._app.add_url_rule('/fleet/screen/add', 'fleet_screen_add', self.fleet_screen_add, methods=['POST'])
self._app.add_url_rule('/fleet/screen/edit', 'fleet_screen_edit', self.fleet_screen_edit, methods=['POST']) self._app.add_url_rule('/fleet/screen/edit', 'fleet_screen_edit', self.fleet_screen_edit, methods=['POST'])
self._app.add_url_rule('/fleet/screen/toggle', 'fleet_screen_toggle', self.fleet_screen_toggle, methods=['POST']) self._app.add_url_rule('/fleet/screen/toggle', 'fleet_screen_toggle', self.fleet_screen_toggle, methods=['POST'])
self._app.add_url_rule('/fleet/screen/delete', 'fleet_screen_delete', self.fleet_screen_delete, methods=['DELETE']) self._app.add_url_rule('/fleet/screen/delete', 'fleet_screen_delete', self.fleet_screen_delete, methods=['DELETE'])
self._app.add_url_rule('/fleet/screen/position', 'fleet_screen_position', self.fleet_screen_position, methods=['POST']) self._app.add_url_rule('/fleet/screen/position', 'fleet_screen_position', self.fleet_screen_position, methods=['POST'])
def fleet(self): def fleet_screen_list(self):
return render_template( return render_template(
'fleet/fleet.jinja.html', 'fleet/fleet.jinja.html',
l=self._l, l=self._l,
@ -34,11 +34,11 @@ class FleetController:
host=request.form['host'], host=request.form['host'],
port=request.form['port'], port=request.form['port'],
)) ))
return redirect(url_for('fleet')) return redirect(url_for('fleet_screen_list'))
def fleet_screen_edit(self): def fleet_screen_edit(self):
self._screen_manager.update_form(request.form['id'], request.form['name'], request.form['host'], request.form['port']) self._screen_manager.update_form(request.form['id'], request.form['name'], request.form['host'], request.form['port'])
return redirect(url_for('fleet')) return redirect(url_for('fleet_screen_list'))
def fleet_screen_toggle(self): def fleet_screen_toggle(self):
data = request.get_json() data = request.get_json()

4
views/base.jinja.html
View File

@ -30,8 +30,8 @@
</a> </a>
</li> </li>
{% if FLEET_MODE %} {% if FLEET_MODE %}
<li class="{{ 'active' if request.url_rule.endpoint == 'fleet' }}"> <li class="{{ 'active' if request.url_rule.endpoint == 'fleet_screen_list' }}">
<a href="{{ url_for('fleet') }}"> <a href="{{ url_for('fleet_screen_list') }}">
<i class="fa fa-tv"></i> {{ l.fleet_page_title }} <i class="fa fa-tv"></i> {{ l.fleet_page_title }}
</a> </a>
</li> </li>