diff --git a/app/models/sites.py b/app/models/sites.py index 48c128a..0e4eb96 100644 --- a/app/models/sites.py +++ b/app/models/sites.py @@ -73,17 +73,24 @@ class DataSite: if not page.exists(): raise FileNotFoundError(f"Le fichier page.json n'existe pas : {page}") - datas = json.loads(page.read_text()) + datas = json.loads(page.read_text())['blocs'] else: - datas = self.datas + datas = self.datas['blocs'].copy() + if 'footer' in datas.keys(): + del datas['footer'] + return datas + def get_footer(self): + datas = self.datas['blocs'] + if 'footer' in datas.keys(): + return datas['footer'] + else: + return None + def update_bloc(self, bloc, form, files=None): - print (form) - for field in form(): - print(field) if files != None: f = files['image'] @@ -160,7 +167,7 @@ class DataSite: def save_server_info(self, serverInfos=dict()): self.datas['publish'] = serverInfos self.update_json() - + def get_theme(self): return self.datas['config']['theme'] @@ -239,7 +246,6 @@ class DataSite: serverInfos['Address']) test_login = subprocess.check_output(test_connect, shell=True, stderr=subprocess.STDOUT) if "Login incorrect" in str(test_login) : - print ("Mauvais login") return False else: return True @@ -248,15 +254,13 @@ class DataSite: def publish(self, serverInfos=dict(), password=str()): userDir = Path(PurePosixPath(self.user_folder)) - - - upload = "lftp -u \"{}\",\"{}\" -p {} {} -e ' mirror -R public {}; chmod -R o+rx ./; bye;'".format(serverInfos['username'], + upload = "lftp -u \"{}\",\"{}\" -p {} {}:{} -e 'mirror -R ./public ./; bye;'".format(serverInfos['username'], password, serverInfos['Port'], serverInfos['Address'], serverInfos['folder']) - set_permissions = "lftp -u \"{}\",\"{}\" -p {} {} -e 'chmod -R o+rx ./; bye;'".format(serverInfos['username'], + set_permissions = "lftp -u \"{}\",\"{}\" -p {} {}:{} -e 'chmod -R o+rx ./; bye;'".format(serverInfos['username'], password, serverInfos['Port'], serverInfos['Address'], @@ -283,4 +287,4 @@ class DataSite: - + diff --git a/app/templates/_print_colors-footer.css b/app/templates/_print_colors-footer.css new file mode 100644 index 0000000..04c28f2 --- /dev/null +++ b/app/templates/_print_colors-footer.css @@ -0,0 +1,4 @@ + {% if footer.fg_color != footer.bg_color %} + color: {{ footer.fg_color }}; background-color: {{ footer.bg_color }}; +{% endif %} + diff --git a/app/templates/admin/_blocs-list.html b/app/templates/admin/_blocs-list.html index 06a00f0..deea8e5 100644 --- a/app/templates/admin/_blocs-list.html +++ b/app/templates/admin/_blocs-list.html @@ -2,13 +2,13 @@