diff --git a/app/views/blubber/compose.php b/app/views/blubber/compose.php index 23b1c217db54aa9473f92b963c106a3897690ee2..3b8b2a0de8a5fcf2b5ed563698a8bafb2f31ed5e 100644 --- a/app/views/blubber/compose.php +++ b/app/views/blubber/compose.php @@ -92,7 +92,7 @@ <input type="hidden" name="user_ids[]" :value="user.user_id"> <span>{{ user.name }}</span> <a href="#" @click.prevent="removeUser"> - <studip-icon shape="trash" size="20" role="clickable"></studip-icon> + <studip-icon shape="trash" :size="20" role="clickable"></studip-icon> </a> </li> </ul> diff --git a/app/views/file/suggest_oer.php b/app/views/file/suggest_oer.php index 84e3cb2562e29b903f548c7e5c4294ba5d1fa094..2d5a6da321a2b2dde0403a8e6110cd6f90e0ea44 100644 --- a/app/views/file/suggest_oer.php +++ b/app/views/file/suggest_oer.php @@ -28,7 +28,7 @@ <header> <h1> <studip-icon shape="<?= $icon_shape ?>" - size="20" + :size="20" class="text-bottom"> </studip-icon> <div id="oer_title"> diff --git a/app/views/oer/market/_searchform.php b/app/views/oer/market/_searchform.php index f0e883a53bec837af3474567f0d60b388d27c4ca..99f76902018d6af9b31cd7fcd8ee8ee9c921786c 100644 --- a/app/views/oer/market/_searchform.php +++ b/app/views/oer/market/_searchform.php @@ -8,7 +8,7 @@ @click.prevent="clearCategory" class="erasefilter" title="<?= _('Filter der Kategorie entfernen') ?>"> - <studip-icon shape="decline" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon shape="decline" role="clickable" :size="16" class="text-bottom"></studip-icon> </a> </span> @@ -23,7 +23,7 @@ @click.prevent="clearDifficulty" class="erasefilter" title="<?= _('Filter des Niveaus entfernen') ?>"> - <studip-icon shape="decline" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon shape="decline" role="clickable" :size="16" class="text-bottom"></studip-icon> </a> </span> @@ -56,35 +56,35 @@ <ul class="clean"> <li> <a href="<?= $controller->link_for("oer/market", ['category' => "audio"]) ?>" @click.prevent="category = 'audio'"> - <studip-icon v-if="category != 'audio'" shape="radiobutton-unchecked" role="clickable" size="16" class="text-bottom"></studip-icon> - <studip-icon v-if="category == 'audio'" shape="radiobutton-checked" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category != 'audio'" shape="radiobutton-unchecked" role="clickable" :size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category == 'audio'" shape="radiobutton-checked" role="clickable" :size="16" class="text-bottom"></studip-icon> <?= _('Audio') ?> </a> </li> <li> <a href="<?= $controller->link_for("oer/market", ['category' => "video"]) ?>" @click.prevent="category = 'video'"> - <studip-icon v-if="category != 'video'" shape="radiobutton-unchecked" role="clickable" size="16" class="text-bottom"></studip-icon> - <studip-icon v-if="category == 'video'" shape="radiobutton-checked" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category != 'video'" shape="radiobutton-unchecked" role="clickable" :size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category == 'video'" shape="radiobutton-checked" role="clickable" :size="16" class="text-bottom"></studip-icon> <?= _('Video') ?> </a> </li> <li> <a href="<?= $controller->link_for("oer/market", ['category' => "presentation"]) ?>" @click.prevent="category = 'presentation'"> - <studip-icon v-if="category != 'presentation'" shape="radiobutton-unchecked" role="clickable" size="16" class="text-bottom"></studip-icon> - <studip-icon v-if="category == 'presentation'" shape="radiobutton-checked" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category != 'presentation'" shape="radiobutton-unchecked" role="clickable" :size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category == 'presentation'" shape="radiobutton-checked" role="clickable" :size="16" class="text-bottom"></studip-icon> <?= _('Folien') ?> </a> </li> <li> <a href="<?= $controller->link_for("oer/market", ['category' => "elearning"]) ?>" @click.prevent="category = 'elearning'"> - <studip-icon v-if="category != 'elearning'" shape="radiobutton-unchecked" role="clickable" size="16" class="text-bottom"></studip-icon> - <studip-icon v-if="category == 'elearning'" shape="radiobutton-checked" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category != 'elearning'" shape="radiobutton-unchecked" role="clickable" :size="16" class="text-bottom"></studip-icon> + <studip-icon v-if="category == 'elearning'" shape="radiobutton-checked" role="clickable" :size="16" class="text-bottom"></studip-icon> <?= _('Lernmodule') ?> </a> </li> <li> <a href="<?= $controller->link_for("oer/market", ['get' => "all"]) ?>"> - <studip-icon shape="link-intern" role="clickable" size="16" class="text-bottom"></studip-icon> + <studip-icon shape="link-intern" role="clickable" :size="16" class="text-bottom"></studip-icon> <?= _('Alles') ?> </a> </li> @@ -140,7 +140,7 @@ <?= _('Klicken Sie auf die Schlagwörter und entdecken Sie Lernmaterialien zum Thema.') ?> </div> <a v-if="tagHistory.length" href="" @click.prevent="backInCloud" class="back-button"> - <studip-icon shape="arr_1left" role="clickable" size="50"></studip-icon> + <studip-icon shape="arr_1left" role="clickable" :size="50"></studip-icon> </a> <ul class="tags clean"> <li v-for="tag in tags"> @@ -167,7 +167,7 @@ <h1> <studip-icon :shape="getIconShape(result)" role="clickable" - size="20" + :size="20" class="text-bottom"></studip-icon> {{ shortenName(result.name) }} </h1> diff --git a/app/views/oer/mymaterial/edit.php b/app/views/oer/mymaterial/edit.php index 87774678ee1584641a48c41b4ee5cce2119dcef5..40089de675d76f4fc6a0e62f67cbd160fa885c18 100644 --- a/app/views/oer/mymaterial/edit.php +++ b/app/views/oer/mymaterial/edit.php @@ -32,7 +32,7 @@ <h1> <studip-icon shape="file" role="clickable" - size="20" + :size="20" class="text-bottom"></studip-icon> <div class="title">{{ name }}</div> </h1> @@ -204,13 +204,13 @@ <a href="#" @click.prevent="removeTag(index)" title="<?= _('Thema aus der Liste streichen') ?>"> - <studip-icon shape="trash" role="clickable" size="20" class="text-bottom"></studip-icon> + <studip-icon shape="trash" role="clickable" :size="20" class="text-bottom"></studip-icon> </a> </li> </ul> <a href="#" @click.prevent="addTag"> - <studip-icon shape="add" role="clickable" size="20" class="text-bottom"></studip-icon> + <studip-icon shape="add" role="clickable" :size="20" class="text-bottom"></studip-icon> <?= _('Thema hinzufügen') ?> </a> </div> diff --git a/app/views/questionnaire/edit.php b/app/views/questionnaire/edit.php index d040b756d7a6a6835c43116ff5bec5d06ddfeade..7003384bb00c9124fd13d6cc6122941971bb300f 100644 --- a/app/views/questionnaire/edit.php +++ b/app/views/questionnaire/edit.php @@ -128,7 +128,7 @@ foreach ($questionnaire->questions as $question) { :ref="key == Object.keys(questiontypes)[0] ? 'autofocus' : ''" href="" @click.prevent="addQuestion(questiontype.type)"> - <studip-icon :shape="questiontype.icon" size="40" role="clickable"></studip-icon> + <studip-icon :shape="questiontype.icon" :size="40" role="clickable"></studip-icon> {{questiontype.name}} </button> </div> @@ -147,7 +147,7 @@ foreach ($questionnaire->questions as $question) { <a :class="activeTab === 'admin' ? 'admin active' : 'admin'" href="" @click.prevent="switchTab('admin')"> - <span class="icon"><studip-icon shape="evaluation" role="clickable" size="30" alt=""></studip-icon></span> + <span class="icon"><studip-icon shape="evaluation" role="clickable" :size="30" alt=""></studip-icon></span> <?= _('Einstellungen') ?> </a> <draggable v-if="questions.length > 0" v-model="questions" handle=".drag-handle" group="questions" class="questions_container questions"> @@ -160,17 +160,17 @@ foreach ($questionnaire->questions as $question) { @click.prevent="switchTab(question.id)"> <span class="drag-handle"></span> <span class="icon type"> - <studip-icon :shape="questiontypes[question.questiontype].icon" role="clickable" size="30" alt=""></studip-icon> + <studip-icon :shape="questiontypes[question.questiontype].icon" role="clickable" :size="30" alt=""></studip-icon> </span> <div v-if="editInternalName !== question.id">{{ question.internal_name || questiontypes[question.questiontype].name}}</div> <div v-else class="inline_editing"> <input type="text" ref="editInternalName" v-model="tempInternalName" class="inlineediting_internal_name"> <button @click="saveInternalName(question.id)"> - <studip-icon shape="accept" role="clickable" size="20" title="<?= _('Internen Namen speichern') ?>"></studip-icon> + <studip-icon shape="accept" role="clickable" :size="20" title="<?= _('Internen Namen speichern') ?>"></studip-icon> </button> <button @click="editInternalName = null"> - <studip-icon shape="decline" role="clickable" size="20" title="<?= _('Internen Namen nicht speichern') ?>"></studip-icon> + <studip-icon shape="decline" role="clickable" :size="20" title="<?= _('Internen Namen nicht speichern') ?>"></studip-icon> </button> </div> </a> @@ -186,7 +186,7 @@ foreach ($questionnaire->questions as $question) { <a :class="activeTab === 'add_question' ? 'add_question active' : 'add_question'" href="" @click.prevent="switchTab('add_question')"> - <span class="icon"><studip-icon shape="add" role="clickable" size="30" alt=""></studip-icon></span> + <span class="icon"><studip-icon shape="add" role="clickable" :size="30" alt=""></studip-icon></span> <?= _('Element hinzufügen') ?> </a> </aside> @@ -210,4 +210,3 @@ foreach ($questionnaire->questions as $question) { <?= \Studip\LinkButton::create(_("Speichern"), 'questionnaire_store', ['onclick' => 'STUDIP.Questionnaire.Editor.submit(); return false;']) ?> </footer> </form> - diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue index c694a024f6f848206264469e207e362d87c67126..3ba26002644d80b4b10d9cb2658204763c0a1227 100644 --- a/resources/vue/components/FilesTable.vue +++ b/resources/vue/components/FilesTable.vue @@ -10,7 +10,7 @@ <studip-icon shape="folder-home-full" role="clickable" class="text-bottom" - size="30"></studip-icon> + :size="30"></studip-icon> <span v-if="breadcrumbs.length === 1"> {{ breadcrumbs[0].name }} </span> diff --git a/resources/vue/components/questionnaires/InputArray.vue b/resources/vue/components/questionnaires/InputArray.vue index 4295e4cb6c4caec99de16147acc9de357ae2e04f..37fa6fc42852cedd7d0b5bf6ec9061550fc0ea29 100644 --- a/resources/vue/components/questionnaires/InputArray.vue +++ b/resources/vue/components/questionnaires/InputArray.vue @@ -19,13 +19,13 @@ <button class="as-link" :title="$gettext('Option löschen')" @click.prevent="askForDeletingOption(index)"> - <studip-icon shape="trash" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="trash" role="clickable" :size="20" alt=""></studip-icon> </button> <button v-if="index == options.length - 1" class="as-link" :title="$gettext('Option hinzufügen')" @click.prevent="addOption"> - <studip-icon shape="add" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="add" role="clickable" :size="20" alt=""></studip-icon> </button> </li> </draggable> diff --git a/resources/vue/components/questionnaires/LikertEdit.vue b/resources/vue/components/questionnaires/LikertEdit.vue index 57228b91486d606164b0b69b3f3b6ef725becd2a..6fa45b3a1dfbadb6cc333c03ae388775ec0a578e 100644 --- a/resources/vue/components/questionnaires/LikertEdit.vue +++ b/resources/vue/components/questionnaires/LikertEdit.vue @@ -42,7 +42,7 @@ <button class="as-link" @click.prevent="askForDeletingStatement(index)" :title="$gettext('Aussage löschen')"> - <studip-icon shape="trash" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="trash" role="clickable" :size="20" alt=""></studip-icon> </button> </td> </tr> @@ -51,7 +51,7 @@ <tr> <td :colspan="typeof val_clone.options !== 'undefined' ? val_clone.options.length + 3 : 3"> <button @click.prevent="addStatement" class="as-link" :title="$gettext('Aussage hinzufügen')"> - <studip-icon shape="add" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="add" role="clickable" :size="20" alt=""></studip-icon> </button> </td> </tr> diff --git a/resources/vue/components/questionnaires/RangescaleEdit.vue b/resources/vue/components/questionnaires/RangescaleEdit.vue index 2d1450fe770f6d3fa0f710a42a56e8f0842d2ff1..d4e702f64a83f5f4abd8d63db5c1de52b35b6ba7 100644 --- a/resources/vue/components/questionnaires/RangescaleEdit.vue +++ b/resources/vue/components/questionnaires/RangescaleEdit.vue @@ -50,7 +50,7 @@ <button class="as-link" @click.prevent="askForDeletingStatement(index)" :title="$gettext('Aussage löschen')"> - <studip-icon shape="trash" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="trash" role="clickable" :size="20" alt=""></studip-icon> </button> </td> </tr> @@ -59,7 +59,7 @@ <tr> <td :colspan="val_clone.maximum - val_clone.minimum + 4 + (typeof val_clone.alternative_answer !== 'undefined' && val_clone.alternative_answer.trim().length > 0 ? 1 : 0)"> <button @click.prevent="addStatement" class="as-link" :title="$gettext('Aussage hinzufügen')"> - <studip-icon shape="add" role="clickable" size="20" alt=""></studip-icon> + <studip-icon shape="add" role="clickable" :size="20" alt=""></studip-icon> </button> </td> </tr>