From 825013b3c2b8cc432b794087447cc214dcaa1212 Mon Sep 17 00:00:00 2001 From: crunk Date: Fri, 25 Mar 2022 13:52:01 +0100 Subject: [PATCH] small bug fix for public themes --- verse/distribusisinfo.py | 1 + verse/editor.py | 6 ++++-- verse/static/css/selector.css | 2 -- verse/static/css/style.css | 19 +++++++++++++++---- .../templates/distribusiworkflow/launch.html | 9 ++++++--- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/verse/distribusisinfo.py b/verse/distribusisinfo.py index b3bc13c..b898011 100644 --- a/verse/distribusisinfo.py +++ b/verse/distribusisinfo.py @@ -23,6 +23,7 @@ class DistribusisInfo: f"{distribusi.publictheme} used in {distribusi.distribusiname}", # noqa: E501 ) publicthemes.append(publictheme) + print(publicthemes) return publicthemes def visibledistribusis(): diff --git a/verse/editor.py b/verse/editor.py index aa474b5..e7bbaa4 100644 --- a/verse/editor.py +++ b/verse/editor.py @@ -41,9 +41,11 @@ def Editor(): def ValidateEditCssForm(editorform, current_distribusi): newcssfolder = os.path.join("themes/userthemes", current_distribusi) - shutil.rmtree(newcssfolder) + if os.path.exists(newcssfolder): + shutil.rmtree(newcssfolder) publicfolder = os.path.join("themes/publicthemes", current_distribusi) - shutil.rmtree(publicfolder) + if os.path.exists(publicfolder): + shutil.rmtree(publicfolder) if editorform.public.data: MakePublicTheme(editorform, current_distribusi) if editorform.cssfile.data: diff --git a/verse/static/css/selector.css b/verse/static/css/selector.css index 70c8e5b..a500a61 100644 --- a/verse/static/css/selector.css +++ b/verse/static/css/selector.css @@ -1,7 +1,5 @@ .selector-style { padding: 0; - margin: 0; - border: 1px solid #ccc; width: 20em; max-width: 20em; position: relative; diff --git a/verse/static/css/style.css b/verse/static/css/style.css index bef0749..d1fd796 100644 --- a/verse/static/css/style.css +++ b/verse/static/css/style.css @@ -17,7 +17,7 @@ div#login{ } div#login form { - width: 200px; + width: 24em; margin: 0 auto; padding-left: 15%; padding-right: 15%; @@ -216,22 +216,33 @@ div.maincontent{ color: black !important; } +.tooltip { + position: relative; + display: inline-block; + border-bottom: 1px dotted black; +} + .tooltip .tooltiptext { visibility: hidden; width: 120px; background-color: black; color: #fff; text-align: center; - border-radius: 1px; padding: 5px 0; - - /* Position the tooltip */ position: absolute; z-index: 1; + bottom: 100%; + left: 50%; + margin-left: -60px; + + /* Fade in tooltip - takes 1 second to go from 0% to 100% opac: */ + opacity: 0; + transition: opacity 2s; } .tooltip:hover .tooltiptext { visibility: visible; + opacity: 1; } /* Project colors so far. diff --git a/verse/templates/distribusiworkflow/launch.html b/verse/templates/distribusiworkflow/launch.html index aefb191..3c4685a 100644 --- a/verse/templates/distribusiworkflow/launch.html +++ b/verse/templates/distribusiworkflow/launch.html @@ -1,7 +1,8 @@

Step 4: Distribusi

-

Run distribusi on your files. This will generate your website and make - your content public.

+

Run distribusi on your files. This will generate your website and make + your content public. Distribusi will unpack your zip file and turn it into a website! +

{{ distribusiform.csrf_token }} {% if files_uploaded or distribusi_live %} @@ -9,9 +10,11 @@ {{ distribusiform.submit }} {% else %} -

+

You need to upload your files first before you can run distribusi on your files. + Go back to step 1 and upload a zipfile with + your files

Go to Step 1 {% endif %}