Skip to content
Snippets Groups Projects
Commit 25915ffd authored by David Siegfried's avatar David Siegfried
Browse files

fix vue-errors, closes #2910 

Closes #2910

Merge request studip/studip!1962
parent c56b3c98
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 31 additions and 32 deletions
app/views/blubber/compose.php
+ 1
− 1
View file @ 25915ffd
......@@ -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>
......
app/views/file/suggest_oer.php
+ 1
− 1
View file @ 25915ffd
......@@ -28,7 +28,7 @@
<header>
<h1>
<studip-icon shape="<?= $icon_shape ?>"
size="20"
:size="20"
class="text-bottom">
</studip-icon>
<div id="oer_title">
......
app/views/oer/market/_searchform.php
+ 13
− 13
View file @ 25915ffd
......@@ -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>
......
app/views/oer/mymaterial/edit.php
+ 3
− 3
View file @ 25915ffd
......@@ -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>
......
app/views/questionnaire/edit.php
+ 6
− 7
View file @ 25915ffd
......@@ -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>
resources/vue/components/FilesTable.vue
+ 1
− 1
View file @ 25915ffd
......@@ -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>
......
resources/vue/components/questionnaires/InputArray.vue
+ 2
− 2
View file @ 25915ffd
......@@ -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>
......
resources/vue/components/questionnaires/LikertEdit.vue
+ 2
− 2
View file @ 25915ffd
......@@ -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>
......
resources/vue/components/questionnaires/RangescaleEdit.vue
+ 2
− 2
View file @ 25915ffd
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment