diff --git a/Makefile b/Makefile index 42f6a2e..01cf6a4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SRC_DIRS = ./tutordeck BLACK_OPTS = --exclude templates ${SRC_DIRS} runserver: ## Run a development server - tutor deck run --dev + tutor deck runserver --dev scss: ## Compile SCSS files to CSS sass ${SASS_OPTS} tutordeck/server/static/scss/:tutordeck/server/static/css/ diff --git a/tutordeck/server/static/img/Mobile Logo.svg b/tutordeck/server/static/img/Mobile Logo.svg new file mode 100644 index 0000000..de67587 --- /dev/null +++ b/tutordeck/server/static/img/Mobile Logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/tutordeck/server/static/img/tutor deck logo.svg b/tutordeck/server/static/img/tutor deck logo.svg new file mode 100644 index 0000000..5c3f978 --- /dev/null +++ b/tutordeck/server/static/img/tutor deck logo.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tutordeck/server/static/js/deck.js b/tutordeck/server/static/js/deck.js index 3ef0e52..dc9e503 100644 --- a/tutordeck/server/static/js/deck.js +++ b/tutordeck/server/static/js/deck.js @@ -73,13 +73,13 @@ const TOAST_CONFIGS = { "$ tutor plugins enable": { title: "Your plugin was successfully enabled", description: - "Running launch platform will allow all changes to plugins to take effect. This could take a few minutes to complete.", + "To apply the changes, run Launch Platform. This will update your platform and may take a few minutes to complete.", showFooter: true, }, "$ tutor plugins upgrade": { title: "Your plugin was successfully updated", description: - "Running launch platform will allow all changes to plugins to take effect. This could take a few minutes to complete.", + "To apply the changes, run Launch Platform. This will update your platform and may take a few minutes to complete.", showFooter: true, }, "$ tutor plugins install": { @@ -90,7 +90,7 @@ const TOAST_CONFIGS = { "$ tutor config save": { title: "You have successfully modified parameters", description: - "Running launch platform will allow all changes to plugins to take effect. This could take a few minutes to complete.", + "To apply the changes, run Launch Platform. This will update your platform and may take a few minutes to complete.", showFooter: true, }, "$ tutor local launch": { diff --git a/tutordeck/server/static/scss/deck.scss b/tutordeck/server/static/scss/deck.scss index 1a41b4b..954677c 100644 --- a/tutordeck/server/static/scss/deck.scss +++ b/tutordeck/server/static/scss/deck.scss @@ -110,44 +110,56 @@ body { } main { display: grid; - grid-template-columns: 20% 80%; + grid-template-columns: 17% 83%; height: 100%; + @media (max-width: 1270px) { + grid-template-columns: 20% 80%; + } + @media (max-width: 1150px) { + grid-template-columns: 22% 78%; + } + @media (max-width: 1050px) { + grid-template-columns: 25% 75%; + } + @media (max-width: 900px) { grid-template-columns: 10% 90%; } nav { - border-right: 1px solid $gray-2; + border-right: 1px solid $gray-1; box-shadow: 2px 0px $gray-1; display: flex; flex-direction: column; height: 100%; header { flex: 0 0 5.5em; - border-bottom: 1px solid $gray-2; + border-bottom: 1px solid $gray-1; display: flex; align-items: center; + justify-content: center; @media (max-width: 900px) { + padding-left: 0; justify-content: center; } - - img { - margin-left: 1.25em; - width: 2em; - height: auto; - @media (max-width: 900px) { - margin: 0; - } - } - h2 { - color: $red; - margin-left: 0.5em; - + #web-logo { + width: 13em; + margin-top: 2em; + margin-bottom: 2em; @media (max-width: 900px) { display: none; } } + #mobile-logo { + display: none; + width: 3em; + margin-top: 2em; + margin-bottom: 2em; + @media (max-width: 900px) { + display: flex; + } + } } menu { padding-inline-start: 0.75em; @@ -155,6 +167,18 @@ main { @media (max-width: 900px) { padding-inline-start: 0; } + #local-launch { + margin: 0; + } + p { + font-size: 0.85em; + color: $gray-4; + padding: 0 3.7em; + margin: 0; + @media (max-width: 900px) { + display: none; + } + } a { @include a-tag(); display: flex; @@ -174,11 +198,12 @@ main { width: 1.25em; } .sidebar-tab-logo-selected { - filter: invert(39%) sepia(98%) saturate(3884%) - hue-rotate(205deg) brightness(95%) contrast(96%); + filter: invert(39%) sepia(98%) saturate(3884%) hue-rotate(205deg) + brightness(95%) contrast(96%); } h4 { margin-left: 1em; + // font-size: 1.15em; @media (max-width: 900px) { display: none; @@ -188,16 +213,22 @@ main { .sidebar-tab-selected { color: $blue; } + &:last-child { + margin-block-start: 0; + padding-top: 16px; + border-top: 1px solid $gray-1; + } } } section { display: flex; flex-direction: column; - margin: 2em; + margin: 1em 2em; header { display: flex; flex-direction: column; .header-address { + margin-top: 1em; font-size: 15px; span { a { @@ -211,7 +242,8 @@ main { flex-direction: row; justify-content: space-between; align-items: center; - height: 4em; + height: 5.5em; + margin-bottom: 2em; @media (max-width: 740px) { // height: 11em; @@ -242,7 +274,6 @@ main { .page-button { display: flex; justify-content: center; - margin-bottom: 1.25em; @media (max-width: 740px) { width: 100%; justify-content: end; @@ -258,31 +289,51 @@ main { } #plugin-full-description { border-top: 1px solid $gray-1; - margin-top: 1em; padding: 1em 0em; } - .search { + .search-and-button { display: flex; - justify-content: flex-end; + justify-content: space-between; align-items: center; - margin-bottom: 1.25em; + margin-bottom: 2em; + .search { + display: flex; + position: relative; + left: -1.5em; - .search-input { - font-size: 1em; - height: 3em; - width: 16em; - border-radius: 10px; - padding-left: 2.5em; - border: 1px solid $gray-2; + .search-input { + font-size: 1em; + height: 3em; + width: 16em; + border-radius: 10px; + padding-left: 2.5em; + border: 1px solid $gray-2; - @media (max-width: 600px) { - width: 75%; + @media (max-width: 600px) { + width: 75%; + } + } + + img { + width: 1.5em; + position: relative; + left: 2.25em; } } + .page-button { + display: flex; + justify-content: center; + @media (max-width: 740px) { + width: 100%; + justify-content: end; + } - img { - position: relative; - left: 2em; + button { + @include command(); + } + .cancel-process-button { + @include cancel-command(); + } } } #warning-main { @@ -432,9 +483,8 @@ main { border: none; img { width: 2em; - filter: invert(32%) sepia(70%) - saturate(4565%) hue-rotate(143deg) - brightness(99%) contrast(102%); + filter: invert(32%) sepia(70%) saturate(4565%) + hue-rotate(143deg) brightness(99%) contrast(102%); } } } @@ -643,10 +693,11 @@ main { word-wrap: break-word; overflow-y: auto; height: 40em; + margin-top: 2em; } } .command-input { - margin-top: 3em; + margin-top: 1em; form { width: 100%; display: flex; @@ -674,7 +725,7 @@ main { width: fit-content; min-width: 20em; position: absolute; - top: 190px; + top: 218px; z-index: 10; background-color: white; overflow-y: auto; @@ -908,6 +959,7 @@ main { } .toast-footer { @include modal-and-toast-footer(); + margin-top: 1em; } .close { position: absolute; diff --git a/tutordeck/server/templates/_base_header.html b/tutordeck/server/templates/_base_header.html index 773651f..70bfdc4 100644 --- a/tutordeck/server/templates/_base_header.html +++ b/tutordeck/server/templates/_base_header.html @@ -7,21 +7,26 @@
{% block page_description %}{% endblock %}
- {% block page_button %}{% endblock %} + {% block page_button_top %}{% endblock %}
{% block searchbar %} -
- - +
+
+ + +
+
+ {% block page_button %}{% endblock %} +
{% endblock %} {% block warning %} diff --git a/tutordeck/server/templates/advanced.html b/tutordeck/server/templates/advanced.html index 5cd853d..5f88262 100644 --- a/tutordeck/server/templates/advanced.html +++ b/tutordeck/server/templates/advanced.html @@ -1,7 +1,7 @@ {% extends "_base_header.html" %} {% block page_title %} -Advanced Mode +Developer Mode {% endblock %} {% block page_description %} diff --git a/tutordeck/server/templates/index.html b/tutordeck/server/templates/index.html index 76d2686..a72a66f 100644 --- a/tutordeck/server/templates/index.html +++ b/tutordeck/server/templates/index.html @@ -22,8 +22,8 @@
@@ -64,8 +67,8 @@
-

Run launch platform for all plugins?

-

Running launch platform will allow all changes to plugins to take effect. This could take a few minutes to complete.

+

Apply Changes to Your Platform?

+

This will run Launch Platform to apply all recent plugin changes. The process may take a few minutes to complete.

@@ -93,7 +96,7 @@
diff --git a/tutordeck/server/templates/local_launch.html b/tutordeck/server/templates/local_launch.html index 1a2948e..6ee1df9 100644 --- a/tutordeck/server/templates/local_launch.html +++ b/tutordeck/server/templates/local_launch.html @@ -1,14 +1,14 @@ {% extends "_base_header.html" %} {% block page_title %} -Execute Launch Platform +Apply changes {% endblock %} {% block page_description %} Running launch platform will allow all changes to plugins to take effect. This could take a few minutes to complete. {% endblock %} -{% block page_button %} +{% block page_button_top %} {% endblock %} diff --git a/tutordeck/server/templates/plugin.html b/tutordeck/server/templates/plugin.html index 5dd374c..0860437 100644 --- a/tutordeck/server/templates/plugin.html +++ b/tutordeck/server/templates/plugin.html @@ -21,6 +21,10 @@ {% if is_enabled and not show_logs %} +
+

Plugin Settings

+

You can adjust the plugin's behavior by changing these settings. Changes will only go live after you apply them.

+

Plugin Parameters

This plugin has default parameters. If you make any changes, save them and run launch platform to make the changes effective.

diff --git a/tutordeck/server/templates/plugin_installed.html b/tutordeck/server/templates/plugin_installed.html index d8bff9d..47fc121 100644 --- a/tutordeck/server/templates/plugin_installed.html +++ b/tutordeck/server/templates/plugin_installed.html @@ -1,7 +1,7 @@ {% extends "_base_header.html" %} {% block page_title %} -My Plugins +Installed Plugins {% endblock %} {% block page_description %} diff --git a/tutordeck/server/templates/plugin_store.html b/tutordeck/server/templates/plugin_store.html index 1cd4ed6..7068683 100644 --- a/tutordeck/server/templates/plugin_store.html +++ b/tutordeck/server/templates/plugin_store.html @@ -5,7 +5,7 @@ Plugin Marketplace {% endblock %} {% block page_description %} -View and install available plugins. +Explore, search, and install plugins to extend your Open edX platform. {% endblock %} {% block page_button %}