- messages also in edit forms of submitter and editor
- help texts on click event in create form
This commit is contained in:
parent
619a37e246
commit
e0dcffdf00
|
@ -108,6 +108,10 @@ class EditorController extends Controller
|
||||||
$languages = DB::table('languages')
|
$languages = DB::table('languages')
|
||||||
->where('active', true)
|
->where('active', true)
|
||||||
->pluck('part1', 'part1');
|
->pluck('part1', 'part1');
|
||||||
|
|
||||||
|
$messages = DB::table('messages')
|
||||||
|
->pluck('help_text', 'metadata_element');
|
||||||
|
|
||||||
$projects = Project::pluck('label', 'id');
|
$projects = Project::pluck('label', 'id');
|
||||||
|
|
||||||
$datum = date('Y-m-d');
|
$datum = date('Y-m-d');
|
||||||
|
@ -144,6 +148,7 @@ class EditorController extends Controller
|
||||||
'titleTypes',
|
'titleTypes',
|
||||||
'descriptionTypes',
|
'descriptionTypes',
|
||||||
'languages',
|
'languages',
|
||||||
|
'messages',
|
||||||
'projects',
|
'projects',
|
||||||
'licenses',
|
'licenses',
|
||||||
'checkeds',
|
'checkeds',
|
||||||
|
|
|
@ -69,6 +69,9 @@ class SubmitController extends Controller
|
||||||
$languages = DB::table('languages')
|
$languages = DB::table('languages')
|
||||||
->where('active', true)
|
->where('active', true)
|
||||||
->pluck('part1', 'part1');
|
->pluck('part1', 'part1');
|
||||||
|
|
||||||
|
$messages = DB::table('messages')
|
||||||
|
->pluck('help_text', 'metadata_element');
|
||||||
|
|
||||||
$projects = Project::pluck('label', 'id');
|
$projects = Project::pluck('label', 'id');
|
||||||
|
|
||||||
|
@ -105,6 +108,7 @@ class SubmitController extends Controller
|
||||||
'titleTypes',
|
'titleTypes',
|
||||||
'descriptionTypes',
|
'descriptionTypes',
|
||||||
'languages',
|
'languages',
|
||||||
|
'messages',
|
||||||
'projects',
|
'projects',
|
||||||
'licenses',
|
'licenses',
|
||||||
'checkeds',
|
'checkeds',
|
||||||
|
|
|
@ -23,7 +23,7 @@ class MessagesTableSeeder extends Seeder
|
||||||
'updated_at' => Carbon::now(),
|
'updated_at' => Carbon::now(),
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
// 2
|
// 2
|
||||||
'metadata_element' => 'dataset_type',
|
'metadata_element' => 'dataset_type',
|
||||||
'help_text' => 'Hier ist die Datenpublikation nach fix vorgegebenen Kategorien zu klassifizieren.',
|
'help_text' => 'Hier ist die Datenpublikation nach fix vorgegebenen Kategorien zu klassifizieren.',
|
||||||
'created_at' => Carbon::now(),
|
'created_at' => Carbon::now(),
|
||||||
|
|
2
public/backend/ckeditor.js
vendored
2
public/backend/ckeditor.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
public/backend/style.css
vendored
4
public/backend/style.css
vendored
|
@ -1020,4 +1020,8 @@ textarea.large, input.large {
|
||||||
.help.is-info {
|
.help.is-info {
|
||||||
color: #4dc0b5;
|
color: #4dc0b5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -113,6 +113,7 @@ export default class EditDataset extends Vue {
|
||||||
this.titleTypes = window.Laravel.titleTypes;
|
this.titleTypes = window.Laravel.titleTypes;
|
||||||
this.descriptionTypes = window.Laravel.descriptionTypes;
|
this.descriptionTypes = window.Laravel.descriptionTypes;
|
||||||
this.languages = window.Laravel.languages;
|
this.languages = window.Laravel.languages;
|
||||||
|
this.messages = window.Laravel.messages;
|
||||||
this.projects = window.Laravel.projects;
|
this.projects = window.Laravel.projects;
|
||||||
this.licenses = window.Laravel.licenses;
|
this.licenses = window.Laravel.licenses;
|
||||||
this.checkeds = window.Laravel.checkeds;
|
this.checkeds = window.Laravel.checkeds;
|
||||||
|
|
|
@ -104,6 +104,9 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import draggable from "vuedraggable";
|
import draggable from "vuedraggable";
|
||||||
import { Component, Inject, Vue, Prop, Watch } from "vue-property-decorator";
|
import { Component, Inject, Vue, Prop, Watch } from "vue-property-decorator";
|
||||||
|
import Tooltip from 'vue-directive-tooltip';
|
||||||
|
import 'vue-directive-tooltip/dist/vueDirectiveTooltip.css';
|
||||||
|
Vue.use(Tooltip);
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { draggable }
|
components: { draggable }
|
||||||
|
|
|
@ -151,7 +151,6 @@ const app = new Vue({
|
||||||
mounted() {
|
mounted() {
|
||||||
//this.step = 2;
|
//this.step = 2;
|
||||||
this.reset();
|
this.reset();
|
||||||
console.log(this.messages);
|
|
||||||
},
|
},
|
||||||
beforeMount() {
|
beforeMount() {
|
||||||
this.messages = window.Laravel.messages;
|
this.messages = window.Laravel.messages;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -77,8 +77,8 @@
|
||||||
</div>
|
</div>
|
||||||
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'"
|
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'"
|
||||||
data-vv-as="Author">
|
data-vv-as="Author">
|
||||||
<person-table name="authors" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
|
<person-table name="authors" v-bind:messages="messages" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
|
||||||
<person-table name="contributors" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
|
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
|
||||||
</person-table>
|
</person-table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
@ -456,8 +456,6 @@
|
||||||
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
|
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset id="fieldset-references">
|
<fieldset id="fieldset-references">
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
'titleTypes' => $titleTypes,
|
'titleTypes' => $titleTypes,
|
||||||
'descriptionTypes' => $descriptionTypes,
|
'descriptionTypes' => $descriptionTypes,
|
||||||
'languages' => $languages,
|
'languages' => $languages,
|
||||||
|
'messages' => $messages,
|
||||||
'projects' => $projects,
|
'projects' => $projects,
|
||||||
'licenses' => $licenses,
|
'licenses' => $licenses,
|
||||||
'checkeds' => $checkeds,
|
'checkeds' => $checkeds,
|
||||||
|
|
|
@ -74,10 +74,9 @@
|
||||||
{{-- {!! Form::label('additionalCreators', 'Add additional creator(s) if creator is not in database') !!}
|
{{-- {!! Form::label('additionalCreators', 'Add additional creator(s) if creator is not in database') !!}
|
||||||
<button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button> --}}
|
<button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button> --}}
|
||||||
</div>
|
</div>
|
||||||
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'"
|
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'" data-vv-as="Author">
|
||||||
data-vv-as="Author">
|
<person-table name="authors" v-bind:messages="messages" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
|
||||||
<person-table name="authors" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
|
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
|
||||||
<person-table name="contributors" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
|
|
||||||
</person-table>
|
</person-table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
@ -453,10 +452,7 @@
|
||||||
</label>
|
</label>
|
||||||
</template>
|
</template>
|
||||||
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
|
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset id="fieldset-references">
|
<fieldset id="fieldset-references">
|
||||||
|
|
|
@ -66,6 +66,7 @@
|
||||||
'titleTypes' => $titleTypes,
|
'titleTypes' => $titleTypes,
|
||||||
'descriptionTypes' => $descriptionTypes,
|
'descriptionTypes' => $descriptionTypes,
|
||||||
'languages' => $languages,
|
'languages' => $languages,
|
||||||
|
'messages' => $messages,
|
||||||
'projects' => $projects,
|
'projects' => $projects,
|
||||||
'licenses' => $licenses,
|
'licenses' => $licenses,
|
||||||
'checkeds' => $checkeds,
|
'checkeds' => $checkeds,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user