iziram
/
ScoDoc
forked from ScoDoc/ScoDoc
1
0
Fork 0
Code Issues 12 Pull Requests 1 Projects 1 Releases Wiki Activity

minor code cleaning

This commit is contained in:
Emmanuel Viennet 2022-10-02 20:44:24 +02:00 committed by iziram
parent 62940db228
commit 4fb296bbfa
2 changed files with 852 additions and 861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1681
app/scodoc/TrivialFormulator.py
View File

File diff suppressed because it is too large Load Diff

32
app/scodoc/sco_preferences.py
View File

@ -2113,28 +2113,22 @@ class BasePreferences(object):
if "explanation" in descr:
del descr["explanation"]
if formsemestre_id:
descr["explanation"] = (
"""ou <span class="spanlink" onclick="set_global_pref(this, '%s');">utiliser paramètre global</span>"""
% pref_name
)
# if descr.get('only_global',False):
# # pas modifiable, donne juste la valeur courante
# descr['readonly'] = True
# descr['explanation'] = '(valeur globale, non modifiable)'
# elif
descr[
"explanation"
] = """ou <span class="spanlink"
onclick="set_global_pref(this, '{pref_name}');"
>utiliser paramètre global</span>"""
if formsemestre_id and self.is_global(formsemestre_id, pref_name):
# valeur actuelle globale (ou vient d'etre supprimee localement):
# montre la valeur et menus pour la rendre locale
descr["readonly"] = True
menu_global = (
"""<select class="tf-selglobal" onchange="sel_global(this, '%s');">
menu_global = f"""<select class="tf-selglobal"
onchange="sel_global(this, '{pref_name}');">
<option value="">Valeur définie globalement</option>
<option value="create">Spécifier valeur pour ce semestre seulement</option>
<option value="create">Spécifier valeur pour ce
semestre seulement</option>
</select>
"""
% pref_name
)
# <option value="changeglobal">Changer paramètres globaux</option>
descr["explanation"] = menu_global
cat_elems.append((pref_name, descr))
@ -2144,18 +2138,18 @@ class BasePreferences(object):
if title:
form.append(
(
"sep_%s" % cat,
{"input_type": "separator", "title": "<h3>%s</h3>" % title},
f"sep_{cat}",
{"input_type": "separator", "title": f"<h3>{title}</h3>"},
)
)
subtitle = cat_descr.get("subtitle", None)
if subtitle:
form.append(
(
"sepsub_%s" % cat,
f"sepsub_{cat}",
{
"input_type": "separator",
"title": '<p class="help">%s</p>' % subtitle,
"title": f'<p class="help">{subtitle}</p>',
},
)
)