gitadmin
/
profile-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mann-fr-cv-studio-0

This commit is contained in:
chris2fr 2020-10-17 15:56:38 +02:00
parent 1859007f34 233b8030be
commit 5f94a88a4d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/preview_single_field.js
View File

@ -36,6 +36,7 @@ Vue.component("preview-field", {
getValue: function()
{
// Return the value formatted.
// console.log("Display Format > " + this.displayFormat)
if (this.displayFormat == "url")
{

14
index.html
View File

@ -364,7 +364,7 @@
</p>
<p>
<label for="summary" class="w3-text-blue"><b>Summary</b></label>
<textarea id="summary" rows="8" class="w3-input w3-border" type="text" v-model="work.summary"></textarea>
<textarea id="summary" rows="8" class="w3-input w3-border" type="text" v-model="work.summary" format="multi-line"></textarea>
<small id="summaryHelp" class="form-help text-muted">Details of your work, responsibilities and achievements. And a little about the company.</small>
</p>
@ -1022,7 +1022,10 @@
<span class="w3-tag w3-teal w3-round" v-if="$root.workEndDate(w_index) == 'Current'">{{$root.workEndDate(w_index)}}</span>
<span v-if="$root.workEndDate(w_index) != 'Current'">{{$root.workEndDate(w_index)}}</span>
</h6>
<div v-html="work.summary"></div>
<!--
<div v-html="work.summary" ></div>
-->
<preview-field :label="''" :value="work.summary" :format="'multi-line'" :datatype="'text'" />
<h5 class="margin-top-32">Highlights</h5>
<ol>
@ -1238,10 +1241,13 @@
<template type="text/x-template" id="preview-single-field-template" lang="html">
<div id="preview-single-field-root">
<div class="w3-row w3-margin-bottom" v-if="displayFormat == '' || displayFormat == 'url' || displayFormat == 'multi-line' || displayFormat == 'email' || displayFormat == 'phone' || displayFormat == 'date'">
<div class="w3-col m3">
<div class="w3-col m3" v-if="label != ''">
<span v-html="getLabel()"></span>
</div>
<div class="w3-col m9">
<div class="w3-col m9" v-if="label != ''">
<span v-html="getValue()"></span>
</div>
<div class="w3-col m12" v-else>
<span v-html="getValue()"></span>
</div>
</div>