remove merge fragments, fixes #4854

Closes #4854

Merge request studip/studip!3637

1 files changed, 0 insertions, 155 deletions

diff --git a/app/views/questionnaire/edit.php b/app/views/questionnaire/edit.php
index 19d3ef9..e5ef007 100644
--- a/app/views/questionnaire/edit.php
+++ b/app/views/questionnaire/edit.php
@@ -50,158 +50,3 @@ $questionnaire_data = [
             'range-id'       => Request::get('range_id'),
             'range-type'     => Request::get('range_type'),
         ]) ?>
-=======
-<form action="<?= URLHelper::getLink('dispatch.php/questionnaire/edit/' . (!$questionnaire->isNew() ? $questionnaire->getId() : '')) ?>"
-      method="post"
-      enctype="multipart/form-data"
-      class="questionnaire_edit default"
-      data-questiontypes="<?= htmlReady(json_encode($questiontypes)) ?>"
-      data-questionnaire_data="<?= htmlReady(json_encode($questionnaire_data)) ?>"
-      data-questions_data="<?= htmlReady(json_encode($questions_data)) ?>"
-      data-range_type="<?= htmlReady(Request::get('range_type')) ?>"
-      data-range_id="<?= htmlReady(Request::get('range_id')) ?>"
-      <?= Request::isAjax() ? 'data-dialog' : '' ?>
-      :data-secure="activateFormSecure">
-
-    <div class="editor">
-        <div class="rightside" aria-live="polite" tabindex="0" ref="rightside">
-            <div class="admin" v-if="activeTab === 'admin'">
-
-                <article aria-live="assertive" class="validation_notes studip">
-                    <header>
-                        <h1>
-                            <?= Icon::create('info-circle', Icon::ROLE_INFO)->asImg(['class' => 'text-bottom validation_notes_icon']) ?>
-                            <?= _('Hinweise zum Ausfüllen des Formulars') ?>
-                        </h1>
-                    </header>
-                    <div class="required_note">
-                        <div aria-hidden="true">
-                            <?= _('Pflichtfelder sind mit Sternchen gekennzeichnet.') ?>
-                        </div>
-                        <div class="sr-only">
-                            <?= _('Dieses Formular enthält Pflichtfelder.') ?>
-                        </div>
-                    </div>
-                    <div v-if="validationNotice && !data.title">
-                        <?= _('Folgende Angaben müssen korrigiert werden, um das Formular abschicken zu können:') ?>
-                        <ul>
-                            <li aria-describedby="questionnaire_title"><?= _('Titel des Fragebogens') ?></li>
-                        </ul>
-                    </div>
-                </article>
-
-                <div class="formpart">
-                    <label class="studiprequired" for="questionnaire_title">
-                        <span class="textlabel"><?= _('Titel des Fragebogens') ?></span>
-                        <span title="Dies ist ein Pflichtfeld" aria-hidden="true" class="asterisk">*</span>
-                    </label>
-                    <input type="text" id="questionnaire_title" v-model="data.title" v-autofocus>
-                </div>
-
-                <div class="hgroup">
-                    <label>
-                        <?= _('Startzeitpunkt') ?>
-                        <datetimepicker v-model="data.startdate"></datetimepicker>
-                    </label>
-                    <label>
-                        <?= _('Endzeitpunkt') ?>
-                        <datetimepicker v-model="data.stopdate"></datetimepicker>
-                    </label>
-                </div>
-                <label>
-                    <input type="checkbox" v-model="data.copyable" true-value="1" false-value="0">
-                    <?= _('Fragebogen zum Kopieren freigeben') ?>
-                </label>
-                <label>
-                    <input type="checkbox" v-model="data.anonymous" true-value="1" false-value="0">
-                    <?= _('Teilnehmende anonymisieren') ?>
-                </label>
-                <label>
-                    <input type="checkbox" v-model="data.editanswers" true-value="1" false-value="0">
-                    <?= _('Teilnehmende dürfen ihre Antworten revidieren') ?>
-                </label>
-                <label>
-                    <?= _('Ergebnisse einsehbar') ?>
-                    <select v-model="data.resultvisibility">
-                        <option value="always"><?= _('Immer') ?></option>
-                        <option value="afterending"><?= _('Nach Ende der Befragung') ?></option>
-                        <option value="afterparticipation"><?= _('Nach der Teilnahme') ?></option>
-                        <option value="never"><?= _('Niemals') ?></option>
-                    </select>
-                </label>
-            </div>
-            <div class="add_question file_select_possibilities" v-else-if="activeTab === 'add_question'">
-                <div>
-                    <button v-for="(questiontype, key) in questiontypes" :key="key"
-                       :ref="key == Object.keys(questiontypes)[0] ? 'autofocus' : ''"
-                       href=""
-                       @click.prevent="addQuestion(questiontype.type)">
-                        <studip-icon :shape="questiontype.icon" :size="40"></studip-icon>
-                        {{questiontype.name}}
-                    </button>
-                </div>
-            </div>
-            <div v-else>
-                <component :is="questiontypes[questions[indexForQuestion].questiontype].component[0]"
-                           v-model="questions[indexForQuestion].questiondata"
-                           :question_id="questions[indexForQuestion].id"
-                           :key="questions[indexForQuestion].id">
-                </component>
-            </div>
-        </div>
-        <aside>
-            <a class="admin"
-               :class="{active: activeTab === 'admin'}"
-               href="#"
-               @click.prevent="switchTab('admin')">
-                <span class="icon"><studip-icon shape="evaluation" :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">
-                <div v-for="question in questions"
-                     :key="question.id"
-                     @mouseenter="hoverTab = question.id"
-                     @mouseleave="hoverTab = null"
-                     :class="(activeTab === question.id || activeTab === 'meta_' + question.id ? 'active' : '') + (hoverTab === question.id ? ' hovered' : '')">
-                    <a href="#"
-                       @click.prevent="switchTab(question.id)">
-                        <span class="drag-handle"></span>
-                        <span class="icon type">
-                            <studip-icon :shape="questiontypes[question.questiontype].icon" :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" :size="20" title="<?= _('Internen Namen speichern') ?>"></studip-icon>
-                            </button>
-                            <button @click="editInternalName = null">
-                                <studip-icon shape="decline" :size="20" title="<?= _('Internen Namen nicht speichern') ?>"></studip-icon>
-                            </button>
-                        </div>
-                    </a>
-
-                    <studip-action-menu :items="[{label: '<?= _('Umbenennen') ?>', icon: 'edit', emit: 'rename'}, {label: '<?= _('Frage kopieren') ?>', icon: 'copy', emit: 'copy'}, {label: '<?= _('Frage nach oben verschieben') ?>', icon: 'arr_1up', emit: 'moveup'}, {label: '<?= _('Frage nach unten verschieben') ?>', icon: 'arr_1down', emit: 'movedown'}, {label: '<?= _('Frage löschen') ?>', icon: 'trash', emit: 'delete'}]"
-                                        @copy="duplicateQuestion(question.id)"
-                                        @rename="renameInternalName(question.id)"
-                                        @moveup="moveQuestionUp(question.id)"
-                                        @movedown="moveQuestionDown(question.id)"
-                                        @delete="deleteQuestion(question.id)"></studip-action-menu>
-                </div>
-            </draggable>
-            <a :class="activeTab === 'add_question' ? 'add_question active' : 'add_question'"
-               href="#"
-               @click.prevent="switchTab('add_question')">
-                <span class="icon"><studip-icon shape="add" :size="30" alt=""></studip-icon></span>
-                <?= _('Element hinzufügen') ?>
-            </a>
-        </aside>
-    </div>
-
-
-    <footer data-dialog-button>
-        <?= Studip\LinkButton::create(_('Speichern'), 'questionnaire_store', ['onclick' => 'STUDIP.Questionnaire.Editor.submit(); return false;']) ?>
-    </footer>
-</form>
->>>>>>> 166e475f04 (introduce vue directive v-autofocus, fixes #3986)