projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix inventors note for Copycat
[vchess.git]
/
client
/
src
/
views
/
Problems.vue
diff --git
a/client/src/views/Problems.vue
b/client/src/views/Problems.vue
index
b989fbc
..
a55126f
100644
(file)
--- a/
client/src/views/Problems.vue
+++ b/
client/src/views/Problems.vue
@@
-47,14
+47,14
@@
main
@input="adjustHeight('instructions')"
v-model="curproblem.instruction"
)
@input="adjustHeight('instructions')"
v-model="curproblem.instruction"
)
-
p
(v-html="parseHtml(curproblem.instruction)")
+
.instructions
(v-html="parseHtml(curproblem.instruction)")
fieldset
textarea.solution-edit(
:placeholder="st.tr['Solution']"
@input="adjustHeight('solution')"
v-model="curproblem.solution"
)
fieldset
textarea.solution-edit(
:placeholder="st.tr['Solution']"
@input="adjustHeight('solution')"
v-model="curproblem.solution"
)
-
p
(v-html="parseHtml(curproblem.solution)")
+
.solution
(v-html="parseHtml(curproblem.solution)")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
button(@click="sendProblem()") {{ st.tr["Send"] }}
#dialog.text-center {{ st.tr[infoMsg] }}
.row(v-if="showOne")
@@
-70,12
+70,12
@@
main
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
| {{ st.tr["Previous_p"] }}
button.nomargin(@click="gotoPrevNext(curproblem,-1)")
| {{ st.tr["Next_p"] }}
-
p
.oneInstructions.clickable(
+
.instructions
.oneInstructions.clickable(
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
v-html="parseHtml(curproblem.instruction)"
@click="curproblem.showSolution=!curproblem.showSolution"
)
| {{ st.tr["Show solution"] }}
-
p
(
+
.solution
(
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
v-show="curproblem.showSolution"
v-html="parseHtml(curproblem.solution)"
)
@@
-131,6
+131,7
@@
import params from "@/parameters";
import { getDiagram, replaceByDiag } from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
import { getDiagram, replaceByDiag } from "@/utils/printDiagram";
import { processModalClick } from "@/utils/modalClick";
import { ArrayFun } from "@/utils/array";
+import afterRawLoad from "@/utils/afterRawLoad";
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
import BaseGame from "@/components/BaseGame.vue";
export default {
name: "my-problems",
@@
-313,19
+314,13
@@
export default {
this.loadedVar = vid;
cb();
});
this.loadedVar = vid;
cb();
});
- // (AJAX) Request to get rules content (plain text, HTML)
this.rulesContent =
this.rulesContent =
- require(
- "raw-loader!@/translations/rules/" +
- variant.name + "/" +
- this.st.lang + ".pug"
- )
- // Next two lines fix a weird issue after last update (2019-11)
- .replace(/\\n/g, " ")
- .replace(/\\"/g, '"')
- .replace('module.exports = "', "")
- .replace(/"$/, "")
- .replace(/(fen:)([^:]*):/g, replaceByDiag);
+ afterRawLoad(
+ require(
+ "raw-loader!@/translations/rules/" + variant.name + "/" +
+ this.st.lang + ".pug"
+ ).default
+ ).replace(/(fen:)([^:]*):/g, replaceByDiag);
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
},
trySetDiagram: function(prob) {
// Problem edit: FEN could be wrong or incomplete,
@@
-513,9
+508,13
@@
export default {
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
@import "@/styles/_rules.sass"
<style lang="sass">
@import "@/styles/_board_squares_img.sass"
@import "@/styles/_rules.sass"
-.br
- display: block
- margin: 10px 0
+.instructions, .solution
+ margin: 0 var(--universal-margin)
+ p, ul, ol, pre, table, h3, h4, h5, h6, blockquote
+ margin: var(--universal-margin) 0
+ .br
+ display: block
+ margin: 10px 0
</style>
<style lang="sass" scoped>
</style>
<style lang="sass" scoped>
@@
-562,7
+561,7
@@
button#loadMoreBtn
& > *
margin: 0
& > *
margin: 0
-
p
.oneInstructions
+.oneInstructions
margin: 0
padding: 2px 5px
background-color: lightgreen
margin: 0
padding: 2px 5px
background-color: lightgreen