Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dashboard
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
dashboard
Commits
a2983a53
Commit
a2983a53
authored
7 years ago
by
jackie / Andrea Ida Malkah Klaura
Browse files
Options
Downloads
Patches
Plain Diff
added modals for show description
parent
56491736
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/ShowManager.vue
+12
-5
12 additions, 5 deletions
src/components/ShowManager.vue
src/components/ShowManagerModalNotes.vue
+1
-6
1 addition, 6 deletions
src/components/ShowManagerModalNotes.vue
src/components/ShowManagerModalShow.vue
+39
-0
39 additions, 0 deletions
src/components/ShowManagerModalShow.vue
with
52 additions
and
11 deletions
src/components/ShowManager.vue
+
12
−
5
View file @
a2983a53
...
@@ -11,18 +11,22 @@
...
@@ -11,18 +11,22 @@
<b-jumbotron>
<b-jumbotron>
<template
slot=
"header"
>
<template
slot=
"header"
>
<span
v-if=
"loaded.shows"
>
{{
shows
[
currentShow
].
name
}}
</span>
<span
v-if=
"loaded.shows"
>
{{
shows
[
currentShow
].
name
}}
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit name of show"
v-on:click=
"$refs.appModalShow.$refs.modalShowName.show()"
/>
</span>
<span
v-else
>
Shows are being loaded
</span>
<span
v-else
>
Shows are being loaded
</span>
</
template
>
</
template
>
<
template
slot=
"lead"
>
<
template
slot=
"lead"
>
<span
v-if=
"loaded.shows"
>
{{
shows
[
currentShow
].
short_description
}}
</span>
<span
v-if=
"loaded.shows"
>
{{
shows
[
currentShow
].
short_description
}}
</span>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit short description"
v-on:click=
"
notYetImplemented
"
/>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit short description"
v-on:click=
"
$refs.appModalShow.$refs.modalShowShortDescription.show()
"
/>
</
template
>
</
template
>
<p
v-if=
"loaded.shows"
>
<p
v-if=
"loaded.shows"
>
<b>
Description:
</b>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit description"
v-on:click=
"
notYetImplemented
"
/>
<b>
Description:
</b>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit description"
v-on:click=
"
$refs.appModalShow.$refs.modalShowDescription.show()
"
/>
<div
v-if=
"loaded.shows"
>
<div
v-if=
"loaded.shows"
>
<!-- TODO: see if we can make a nice but secure html rendering of the description -->
<!-- TODO: see if we can make a nice but secure html rendering of the description -->
{{ shows[currentShow].description.replace(/
<
[^
>
]*>/g, '') }}
<!--{{ shows[currentShow].description.replace(/<[^>]*>/g, '') }}-->
{{ shows[currentShow].description }}
<!-- TODO: add image and logo here? -->
<!-- TODO: add image and logo here? -->
</div>
</div>
</p>
</p>
...
@@ -36,6 +40,7 @@
...
@@ -36,6 +40,7 @@
</b-row>
</b-row>
</div>
</div>
<div
v-else
>
<div
v-else
>
<app-modalShow
ref=
"appModalShow"
v-bind:show=
"shows[currentShow]"
></app-modalShow>
<app-modalNotes
ref=
"appModalNotes"
v-bind:note=
"current.note"
></app-modalNotes>
<app-modalNotes
ref=
"appModalNotes"
v-bind:note=
"current.note"
></app-modalNotes>
<p
align=
"left"
>
Die nächsten
<select
v-model=
"numUpcoming"
>
<p
align=
"left"
>
Die nächsten
<select
v-model=
"numUpcoming"
>
...
@@ -259,13 +264,15 @@
...
@@ -259,13 +264,15 @@
<
script
>
<
script
>
import
modalNotes
from
'
./ShowManagerModalNotes.vue
'
import
modalNotes
from
'
./ShowManagerModalNotes.vue
'
import
modalShow
from
'
./ShowManagerModalShow.vue
'
import
timeslotSort
from
'
../mixins/timeslotSort
'
import
timeslotSort
from
'
../mixins/timeslotSort
'
import
prettyDate
from
'
../mixins/prettyDate
'
import
prettyDate
from
'
../mixins/prettyDate
'
import
axios
from
'
axios
'
import
axios
from
'
axios
'
export
default
{
export
default
{
components
:
{
components
:
{
'
app-modalNotes
'
:
modalNotes
'
app-modalNotes
'
:
modalNotes
,
'
app-modalShow
'
:
modalShow
},
},
data
()
{
data
()
{
return
{
return
{
...
...
This diff is collapsed.
Click to expand it.
src/components/ShowManagerModalNotes.vue
+
1
−
6
View file @
a2983a53
...
@@ -40,10 +40,5 @@ export default {
...
@@ -40,10 +40,5 @@ export default {
</
script
>
</
script
>
<
style
scoped
>
<
style
scoped
>
div
.recenttimeslots
{
margin-top
:
2em
;
}
.showsettings
,
.recenttimeslots
,
.nexttimeslots
{
text-align
:
left
;
}
</
style
>
</
style
>
This diff is collapsed.
Click to expand it.
src/components/ShowManagerModalShow.vue
0 → 100644
+
39
−
0
View file @
a2983a53
<
template
>
<div>
<b-modal
ref=
"modalShowName"
title=
"Name of the show"
size=
"lg"
>
<b-form-input
v-model=
"show.name"
type=
"text"
placeholder=
"Enter name of the show"
></b-form-input>
</b-modal>
<b-modal
ref=
"modalShowShortDescription"
title=
"Short description"
size=
"lg"
>
<b-form-textarea
v-model=
"show.short_description"
:rows=
"2"
placeholder=
"Enter a short description"
></b-form-textarea>
</b-modal>
<b-modal
ref=
"modalShowDescription"
title=
"Full description"
size=
"lg"
>
<b-form-textarea
v-model=
"show.description"
:rows=
"2"
placeholder=
"Enter the full description of this show"
></b-form-textarea>
</b-modal>
</div>
</
template
>
<
script
>
// import axios from 'axios'
export
default
{
props
:
{
show
:
{
type
:
Object
,
required
:
true
}
},
data
()
{
return
{
}
},
methods
:
{
save
:
function
()
{
}
}
}
</
script
>
<
style
scoped
>
</
style
>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment