First full release
This commit is contained in:
Luka Romih
@@ -10,6 +10,11 @@ block pageSpecificScipts
|
||||
script(nonce=cspNonce src="/javascripts/consultancy-search-mechanism.js")
|
||||
|
||||
block body
|
||||
input#consultancyContext(
|
||||
type="hidden"
|
||||
name="consultancyContext"
|
||||
value=consultancyPageType
|
||||
)
|
||||
- const specificUserRights = user && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
|
||||
//- .consultancy-padding-admin.consultancy-container-unique
|
||||
section#fixed-top-section
|
||||
@@ -17,8 +22,8 @@ block body
|
||||
+main-navigation(false)
|
||||
block config
|
||||
- const pageTypeObject = { new: true }
|
||||
- const subHeading = 'Novo'
|
||||
- const description = 'Seznam vprašanj, ki so jih poslali uporabniki, in še niso bila dodeljena moderatorjem.'
|
||||
- const subHeading = t('Novo')
|
||||
- const description = t('Seznam vprašanj, ki so jih poslali uporabniki, in še niso bila dodeljena moderatorjem.')
|
||||
|
||||
+sideMenu(pageTypeObject)
|
||||
|
||||
@@ -32,33 +37,25 @@ block body
|
||||
include /utilities/consultancy-admin-panel-header
|
||||
//- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
|
||||
// - 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.'
|
||||
- const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: subHeading, h2: 'Administratorska konzola', description: description }
|
||||
- const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: subHeading, h2: t('Administratorska konzola'), description: description }
|
||||
+mainHeader(c)
|
||||
.content-hold-prerequisites
|
||||
#offset-main.main-container
|
||||
include /components/consultancy/admin/consultancy-item-admin
|
||||
block consultancyContainer
|
||||
- const section = pageTypeObject
|
||||
.consultancy-container
|
||||
if pageTypeObject.new
|
||||
each entry in entries
|
||||
+consultancyItem(entry, section)
|
||||
else
|
||||
//- - const moderatorList = entries.filter(a => a.isModerator)
|
||||
each entry in entries
|
||||
//- -
|
||||
entry.sharedAuthors = entries.filter(a => {
|
||||
return !a.isModerator && entry.id === a.id
|
||||
}).map(a => a.name = `${a.firstName} ${a.lastName}`)
|
||||
+consultancyItem(entry, section)
|
||||
#results-data.consultancy-container
|
||||
each entry in entries
|
||||
+consultancyItem(entry, section)
|
||||
|
||||
include /common/footer
|
||||
else
|
||||
include /utilities/empty-main-panel-header
|
||||
+mainHeader
|
||||
.content-hold-prerequisites.ps-4.pe-4
|
||||
#offset-main.ps-2.pe-2
|
||||
p Nimate ustreznih pravic
|
||||
include /common/footer
|
||||
|
||||
include ../../../utilities/modal-alert-mixin
|
||||
+alertModal("deleteModal","Izbriši" ,"Prekliči" , "del-btn", "cancel-btn")
|
||||
include /common/footer
|
||||
+alertModal("deleteModal",t("Izbriši") ,t("Prekliči") , "del-btn", "cancel-btn")
|
||||
|
||||
@@ -29,7 +29,7 @@ mixin consultancyAdminAssignModal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header.mb-0.pb-0
|
||||
h5.pt-3.navigation-text-color Dodeli
|
||||
h5.pt-3.navigation-text-color #{ t('Dodeli') }
|
||||
button.btn-close(
|
||||
type="button"
|
||||
data-bs-dismiss="modal"
|
||||
@@ -43,9 +43,9 @@ mixin consultancyAdminAssignModal
|
||||
button.btn.btn-secondary.height50(
|
||||
type="button"
|
||||
data-bs-dismiss="modal"
|
||||
) Zapri
|
||||
) #{ t('Zapri') }
|
||||
.col.d-flex.justify-content-end.mb-2
|
||||
button#assign-btn.btn.btn-primary.height50(
|
||||
type="button"
|
||||
data-bs-dismiss="modal"
|
||||
) Uporabi
|
||||
) #{ t('Uporabi') }
|
||||
|
||||
@@ -41,7 +41,7 @@ mixin consultancyAdminShareModal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header.mb-0.pb-0
|
||||
h5.pt-3.navigation-text-color Deli
|
||||
h5.pt-3.navigation-text-color #{ t('Deli') }
|
||||
button.btn-close(
|
||||
type="button"
|
||||
data-bs-dismiss="modal"
|
||||
@@ -55,6 +55,6 @@ mixin consultancyAdminShareModal
|
||||
button#close-shared.btn.btn-secondary.height50(
|
||||
type="button"
|
||||
data-bs-dismiss="modal"
|
||||
) Zapri
|
||||
) #{ t('Zapri') }
|
||||
#add-shared-author.col.d-flex.justify-content-end.mb-2
|
||||
button.btn.btn-primary.height50(type="button") Dodaj
|
||||
button.btn.btn-primary.height50(type="button") #{ t('Dodaj') }
|
||||
|
||||
@@ -19,8 +19,8 @@ block body
|
||||
+main-navigation(false)
|
||||
block config
|
||||
- const pageTypeObject = sentFrom
|
||||
- const subHeading = 'Urejanje'
|
||||
- const description = 'Dodajte terminološki odgovor in ga utemeljite.'
|
||||
- const subHeading = t('Urejanje')
|
||||
- const description = t('Dodajte terminološki odgovor in ga utemeljite.')
|
||||
|
||||
+sideMenu(pageTypeObject)
|
||||
|
||||
@@ -28,32 +28,32 @@ block body
|
||||
|
||||
include /utilities/consultancy-admin-in-progress-panel-header
|
||||
//- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
|
||||
- const c = { noSidebar: true, hrefurl: `/svetovanje/vprasanje/admin/${sentFrom}`, specificRights: specificUserRights, exportButtonPresent: false, h1: 'Urejanje terminološkega odgovora', description: 'Dodajte terminološki odgovor in ga utemeljite.', buttons: [{ form: 'edit-form', type: 'button', content: 'Shrani spremembe', contentDisabled: true }] }
|
||||
- const c = { noSidebar: true, hrefurl: `/svetovanje/vprasanje/admin/${sentFrom}`, specificRights: specificUserRights, exportButtonPresent: false, h1: t('Urejanje terminološkega odgovora'), description: t('Dodajte terminološki odgovor in ga utemeljite.'), buttons: [{ form: 'edit-form', type: 'button', content: t('Shrani'), contentDisabled: true }] }
|
||||
+mainHeader(c)
|
||||
if specificUserRights
|
||||
.content-hold-prerequisites
|
||||
#offset-main.main-container.offset-correction
|
||||
.row.mt-4.mx-0
|
||||
.col.g-0
|
||||
p.text-header-description-gray.mb-2 <b>Datum vprašanja:</b> #{ entry.timeCreated }
|
||||
p.text-header-description-gray.mt-2.mb-0 <b>Uporabnik:</b> #{ author.firstName }
|
||||
p.text-header-description-gray.mt-1 <b>E-pošta:</b> #{ author.email }
|
||||
p.text-header-description-gray.mb-2 <b>#{ t('Datum vprašanja:') }</b> #{ entry.timeCreated }
|
||||
p.text-header-description-gray.mt-2.mb-0 <b>#{ t('Uporabnik') }:</b> #{ author.firstName }
|
||||
p.text-header-description-gray.mt-1 <b>#{ t('E-pošta') }:</b> #{ author.email }
|
||||
hr
|
||||
p.text-header-description-gray.mb-2 <b>Datum objave/spremembe:</b> #{ entry.timePublished }
|
||||
p.text-header-description-gray.mt-2.mb-0 <b>Avtorji mnenja:</b>
|
||||
p.text-header-description-gray.mb-2 <b>#{ t('Datum objave/spremembe') }:</b> #{ entry.timePublished }
|
||||
p.text-header-description-gray.mt-2.mb-0 <b>#{ t('Avtorji mnenja:') }</b>
|
||||
span.text-header-description-gray= ` ${entry.answerAuthors ? entry.answerAuthors.join(`, `) : ''}`
|
||||
p.text-header-description-gray.mt-1 <b>URL povezava do mnenja:</b> #{ isPublished?`${urlPrefix}/svetovanje/vprasanje/${id}`:'' }
|
||||
p.text-header-description-gray.mt-1 <b>#{ t('URL povezava do mnenja:') }</b> #{ isPublished?`${urlPrefix}/svetovanje/vprasanje/${id}`:'' }
|
||||
hr
|
||||
form#edit-form.row(method="put" action="/api/v1/consultancy/entry")
|
||||
input(type="hidden" name="_method" value="put")
|
||||
input#entry-id.d-none(type="text" value=id)
|
||||
.col
|
||||
h5.navigation-text-color Urejanje
|
||||
h5.navigation-text-color #{ t('Urejanje') }
|
||||
|
||||
#question-title-field.mt-4
|
||||
.title.mt-4
|
||||
.subject-name.col.d-flex.justify-content-between
|
||||
label.mb-1.smaller-gray-uppercase(for="address") NASLOV*
|
||||
label.mb-1.smaller-gray-uppercase(for="address") #{ t('NASLOV') }*
|
||||
- const type = 'two'
|
||||
+mixedContentBtns
|
||||
.row
|
||||
@@ -67,7 +67,7 @@ block body
|
||||
|
||||
.cerif-area.mt-4
|
||||
.subject-name
|
||||
label.smaller-gray-uppercase(for="select-cerif") PODROČJE
|
||||
label.smaller-gray-uppercase(for="select-cerif") #{ t('PODROČJE') }
|
||||
.row
|
||||
#cerif
|
||||
select#select-cerif.select-cerif.name-input.d-inline.form-control(
|
||||
@@ -80,14 +80,14 @@ block body
|
||||
value=domain.id
|
||||
selected=domain.id === entry.domainPrimaryId
|
||||
)= domain.nameSl
|
||||
#invalid-section.invalid-feedback-selection.hidden-section.mt-3 Nimate izbranega področja CERIF.
|
||||
#invalid-section.invalid-feedback-selection.hidden-section.mt-3 #{ t('Nimate izbranega področja CERIF.') }
|
||||
//- .col-sm.d-flex.align-items-center
|
||||
span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Področje, v katero sodi opisani terminološki problem
|
||||
|
||||
#question-field.mt-4
|
||||
.title.mt-4
|
||||
.subject-name.col.d-flex.justify-content-between
|
||||
label.mb-1.smaller-gray-uppercase(for="questionTitle") VPRAŠANJE*
|
||||
label.mb-1.smaller-gray-uppercase(for="questionTitle") #{ t('VPRAŠANJE') }*
|
||||
+mixedContentBtns(type)
|
||||
.row
|
||||
.col
|
||||
@@ -100,7 +100,7 @@ block body
|
||||
|
||||
#text-editor.mt-4
|
||||
.subject-name
|
||||
span.smaller-gray-uppercase MNENJE*
|
||||
span.smaller-gray-uppercase #{ t('MNENJE') }*
|
||||
.row
|
||||
.col
|
||||
-
|
||||
@@ -110,24 +110,24 @@ block body
|
||||
} else {
|
||||
if(entry.institution){
|
||||
innerHTML += `
|
||||
<b>Institucija:</b> ${entry.institution}
|
||||
<b>${t('Institucija')}:</b> ${entry.institution}
|
||||
<br><br>
|
||||
`
|
||||
}
|
||||
if(entry.description){
|
||||
innerHTML += `
|
||||
<b>Opis terminološkega problema:</b> ${entry.description}
|
||||
<b>${t('Opis terminološkega problema')}:</b> ${entry.description}
|
||||
<br><br>`
|
||||
}
|
||||
if(entry.existingSolutions){
|
||||
innerHTML += `
|
||||
<b>Obstoječe poimenovalne rešitve:</b> ${entry.existingSolutions}
|
||||
<b>${t('Obstoječe poimenovalne rešitve')}:</b> ${entry.existingSolutions}
|
||||
<br><br>
|
||||
`
|
||||
}
|
||||
if(entry.examplesOfUse){
|
||||
innerHTML += `
|
||||
<b>Primeri rabe:</b> ${entry.examplesOfUse}
|
||||
<b>${t('Primeri rabe')}:</b> ${entry.examplesOfUse}
|
||||
<br><br><br>
|
||||
`
|
||||
}
|
||||
@@ -136,14 +136,14 @@ block body
|
||||
#opinion.summernote !{ innerHTML }
|
||||
//- .col-sm.d-flex.align-items-center
|
||||
span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Navodilo k posamičnemu polju. Reprehenderit aliqua quis ut velit eu irure non ad sunt sunt ipsum sunt esse.
|
||||
.comments-content.col-12.col-md-12.py-md-3.bd-content
|
||||
.comments-content.col-12.col-md-12.pt-md-3.bd-content
|
||||
include /utilities/comments-with-pager
|
||||
include /common/footer
|
||||
else
|
||||
include /utilities/empty-main-panel-header
|
||||
+mainHeader
|
||||
.content-hold-prerequisites.ps-4.pe-4
|
||||
#offset-main.ps-2.pe-2
|
||||
p Nimate ustreznih pravic
|
||||
p #{ t('Nimate ustreznih pravic') }
|
||||
include /utilities/modal-alert-mixin
|
||||
+alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
|
||||
include /common/footer
|
||||
+alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))
|
||||
|
||||
@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
|
||||
|
||||
block config
|
||||
- const pageTypeObject = { inProgress: true }
|
||||
- const subHeading = 'V delu'
|
||||
- const description = 'Seznam vprašanj, ki so še v urejanju.'
|
||||
- const subHeading = t('V delu')
|
||||
- const description = t('Seznam vprašanj, ki so še v urejanju.')
|
||||
|
||||
@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
|
||||
|
||||
block config
|
||||
- const pageTypeObject = { prepared: true }
|
||||
- const subHeading = 'Pripravljeno'
|
||||
- const description = 'Seznam urejenih vprašanj, ki čakajo na potrditev dokončne objave.'
|
||||
- const subHeading = t('Pripravljeno')
|
||||
- const description = t('Seznam urejenih vprašanj, ki čakajo na potrditev dokončne objave.')
|
||||
|
||||
@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
|
||||
|
||||
block config
|
||||
- const pageTypeObject = { published: true }
|
||||
- const subHeading = 'Objavljeno'
|
||||
- const description = 'Seznam objavljenih vprašanj.'
|
||||
- const subHeading = t('Objavljeno')
|
||||
- const description = t('Seznam objavljenih vprašanj.')
|
||||
|
||||
@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
|
||||
|
||||
block config
|
||||
- const pageTypeObject = { rejected: true }
|
||||
- const subHeading = 'Zavrnjeno'
|
||||
- const description = 'Seznam vprašanj, ki so jih moderatorji zavrnili in jih je treba dodeliti nekomu drugemu.'
|
||||
- const subHeading = t('Zavrnjeno')
|
||||
- const description = t('Seznam vprašanj, ki so jih moderatorji zavrnili in jih je treba dodeliti nekomu drugemu.')
|
||||
|
||||
@@ -23,7 +23,7 @@ block body
|
||||
+main-navigation(false)
|
||||
block config
|
||||
- const pageTypeObject = { stats: true }
|
||||
- const subHeading = 'Statistika'
|
||||
- const subHeading = t('Statistika')
|
||||
|
||||
+sideMenu(pageTypeObject)
|
||||
|
||||
@@ -36,7 +36,7 @@ block body
|
||||
if specificUserRights
|
||||
include /utilities/consultancy-admin-panel-header
|
||||
//- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
|
||||
- const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: 'Statistika', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
|
||||
- const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: t('Statistika'), description: 'STATISTIKA_PLACEHOLDER', buttons: [{ type: 'link', content: t('Zastavi novo vprašanje'), url: '/svetovanje/vprasanje/novo' }] }
|
||||
+mainHeader(c)
|
||||
.content-hold-prerequisites.ps-4.pe-4
|
||||
#offset-main.ps-2.pe-2
|
||||
@@ -50,7 +50,7 @@ block body
|
||||
+mainHeader
|
||||
.content-hold-prerequisites.ps-4.pe-4
|
||||
#offset-main.ps-2.pe-2
|
||||
p Nimate ustreznih pravic
|
||||
p #{ t('Nimate ustreznih pravic') }
|
||||
|
||||
//- include ../../../utilities/modal-alert-mixin
|
||||
//- +alertModal("deleteModal","Izbriši" ,"Prekliči" , "del-btn", "cancel-btn")
|
||||
|
||||
@@ -24,7 +24,7 @@ block body
|
||||
+main-navigation(false)
|
||||
block config
|
||||
- const pageTypeObject = { users: true }
|
||||
- const subHeading = 'Uporabniki'
|
||||
- const subHeading = t('Uporabniki')
|
||||
|
||||
+sideMenu(pageTypeObject)
|
||||
|
||||
@@ -40,9 +40,9 @@ block body
|
||||
.header-container-left-side.d-flex.col-sm-10
|
||||
#chevrons-left.d-flex.w-100
|
||||
.header-container-divider-left
|
||||
h2#site-header-title Uporabniki
|
||||
h1#site-heading Seznam svetovalcev
|
||||
span#text-description.page-description.pe-0 Na tem mestu lahko dodajate svetovalce, ki so registrirani uporabniki terminološkega portala. Če boste pripisali področje, boste lahko svetovalcu dodeljevali samo vprašanja, ki sodijo na izbrano področje, vsem drugim pa vsa.
|
||||
h2#site-header-title #{ t('Uporabniki') }
|
||||
h1#site-heading #{ t('Seznam svetovalcev') }
|
||||
span#text-description.page-description.pe-0 #{ t('Na tem mestu lahko dodajate svetovalce, ki so registrirani uporabniki terminološkega portala. Če boste pripisali področje, boste lahko svetovalcu dodeljevali samo vprašanja, ki sodijo na izbrano področje, vsem drugim pa vsa.') }'
|
||||
.header-container-divider-right.d-flex.justify-content-end.col-sm-2
|
||||
//- a.btn.btn-primary.header-btn(disabled) Dodaj
|
||||
|
||||
@@ -60,8 +60,8 @@ block body
|
||||
table#all-areas-table.table.areas-table.table-responsive
|
||||
thead
|
||||
tr
|
||||
th(scope="col") Ime
|
||||
th(scope="col") Področja
|
||||
th(scope="col") #{ t('Ime') }
|
||||
th(scope="col") #{ t('Področja') }
|
||||
th(scope="col")
|
||||
tbody
|
||||
each user in users
|
||||
@@ -90,14 +90,14 @@ block body
|
||||
.row.mb-5
|
||||
.col-sm-3
|
||||
.subject-name
|
||||
label.input-name-txt Ime
|
||||
label.input-name-txt #{ t('Ime') }
|
||||
input#username.form-control(type="text")
|
||||
.col-sm-3
|
||||
.subject-name
|
||||
label.input-name-txt Področja
|
||||
label.input-name-txt #{ t('Področja') }
|
||||
input#domains.form-control(type="text")
|
||||
.col.d-flex.align-items-end.mt-2
|
||||
button#add-area.btn.btn-primary(type="submit") Dodaj
|
||||
button#add-area.btn.btn-primary(type="submit") #{ t('Dodaj') }
|
||||
|
||||
include /common/footer
|
||||
include /utilities/modal-alert
|
||||
include /common/footer
|
||||
|
||||
Reference in New Issue
Block a user