diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss index 48e50c0f2e..4b027659a5 100755 --- a/assets/css/scss/_base.scss +++ b/assets/css/scss/_base.scss @@ -933,7 +933,6 @@ hr { } /******************* ACCORDION B4 *****************/ - .accordion-b4 { .card { border: 0 none; diff --git a/assets/css/scss/_jqueryui.scss b/assets/css/scss/_jqueryui.scss new file mode 100644 index 0000000000..5fc94ec28d --- /dev/null +++ b/assets/css/scss/_jqueryui.scss @@ -0,0 +1,47 @@ +.ui-widget{ + font-family: inherit; +} +.ui-accordion{ + .ui-accordion-header{ + padding: 0; + margin: 0; + } + .card{ + margin-bottom: 0; + margin-top: 1rem; + .card-body{ + padding: 0; + .question-title{ + padding-top: .5rem; + padding-bottom: .5rem; + font-weight: bold; + } + } + .btn-moved{ + padding: .6rem .5rem; + font-size: 1.25rem; + display: block; + text-align: center; + } + } +} +.ui-state-default{ + border: none; + background: transparent; +} +.ui-sortable-helper{ + .card{ + background: #ffffd9; + } +} +.ui-accordion-header-active{ + &.ui-state-active{ + .card{ + background-color: #607d8b; + } + } +} +.ui-widget-content{ + border: 1px solid #e5e9f2; + background: #faffff; +} diff --git a/assets/css/scss/index.scss b/assets/css/scss/index.scss index fafdea91a4..a4d40257e3 100755 --- a/assets/css/scss/index.scss +++ b/assets/css/scss/index.scss @@ -7,5 +7,6 @@ @import "forms"; @import 'base'; @import 'announcement'; +@import "jqueryui"; /* @import "spinner";*/ diff --git a/main/exercise/exercise.php b/main/exercise/exercise.php index 87a8604470..e9c5bd2e96 100644 --- a/main/exercise/exercise.php +++ b/main/exercise/exercise.php @@ -1009,8 +1009,9 @@ if (!empty($exerciseList)) { ), '', [ - 'onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteJS'), ENT_QUOTES, $charset))." ".addslashes($exercise->getUnformattedTitle())."?"."')) return false;", 'href' => 'exercise.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'], + 'title' => addslashes(api_htmlentities(get_lang('AreYouSureToDeleteJS'),ENT_QUOTES, $charset))." ".addslashes($exercise->getUnformattedTitle())."?", + 'class' => 'delete-swal' ] ); } else { diff --git a/main/exercise/question_list_admin.inc.php b/main/exercise/question_list_admin.inc.php index 02504f58f6..b673f78152 100755 --- a/main/exercise/question_list_admin.inc.php +++ b/main/exercise/question_list_admin.inc.php @@ -204,13 +204,8 @@ if (!$inATest) { } echo ' -