muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing attribute, wrapped macros button

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-28 16:38:10 +05:30
parent 0f9c3fcaeb
commit c4e9965681
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pug/templates/macros.pug
View File

@@ -36,20 +36,20 @@ script#macros-template(type="text/x-template")
.fa.fa-plus .fa.fa-plus
.tabs .tabs
input(type="radio",v-for="(index,macros) in config.macros",:id="tab{{index}}", input(type="radio",v-for="(index,macros) in config.macros",:id="'tab'+index",
:name="tabs",:checked="index == 0", @click="tab=index",:key="index") :name="tabs",:checked="index == 0", @click="tab=index")
label(:for="tab{{index}}",style="height:50px;width:100px",:key="index") Macros {{index+1}} label(:for="'tab'+index",style="height:50px;width:100px",:key="index") Macros {{index}}
section.tab-content(v-for="(index,macros) in config.macros",id="content{index}}",:key="index") section.tab-content(v-for="(index,macros) in config.macros",id="'content'+index",:key="index")
.macros-form .macros-form
p.title Name p.title Name
.input-container .input-container
input.input-color(type="color",:id="macros-color-{{index}}",value="#ffffff") input.input-color(type="color",:id="'macros-color-'+index",value="#ffffff")
input.input-name(type="text",minlength='1',maxlength='15',:id="macros-name-{{index}}" ,v-model="getMacrosName") input.input-name(type="text",minlength='1',maxlength='15',:id="'macros-name-'+index" ,v-model="getMacrosName")
p.title G-Code p.title G-Code
.flex-row-container .flex-row-container
select(:id="gcodeSelect-{{index}}",title="Select previously uploaded GCode programs.",selected select(:id="'gcodeSelect-'+index",title="Select previously uploaded GCode programs.",selected
v-model="selectedValues[{{index}}]",@change="loadMacrosGcode", :disabled="!is_ready", v-model="selectedValues[index]",@change="loadMacrosGcode", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option( selected='' value='default') Create G-Code option( selected='' value='default') Create G-Code
option(v-for="file in macrosList", :value="file") {{file}} option(v-for="file in macrosList", :value="file") {{file}}
@@ -62,11 +62,11 @@ script#macros-template(type="text/x-template")
input(type="file", @change="uploadMacrosGcode", :disabled="!is_ready", input(type="file", @change="uploadMacrosGcode", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
button.blue-button(title="Delete Macros GCode",@click="deleteGCode = true", button.blue-button(title="Delete Macros GCode",@click="deleteGCode = true",
:disabled="!selectedValues[{{index}}]=='default'") Delete :disabled="!selectedValues[index]=='default'") Delete
.fa.fa-trash .fa.fa-trash
br br
.gcodeContainer .gcodeContainer
textarea.new-gcode(id="gcode-field", :value="newGcode[{{index}}]" @input="updateNewGcode") textarea.new-gcode(id="gcode-field", :value="newGcode[index]" @input="updateNewGcode")
button.submit-macros.button-submit(title="Save Macros",@click="confirmSave=true",:disabled="!edited") Save button.submit-macros.button-submit(title="Save Macros",@click="confirmSave=true",:disabled="!edited") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros",style="margin-left:5px;background-color:#fafafa;") Cancel button.submit-macros(title="Cancel Macros",@click="cancelMacros",style="margin-left:5px;background-color:#fafafa;") Cancel

9
src/stylus/style.styl
View File

@@ -622,16 +622,19 @@ span.unit
.macros-div .macros-div
display flex display flex
justify-content space-around flex-wrap wrap
justify-content flex-start
margin 10px margin 10px
margin-left 100px margin-left 50px
margin-bottom 30px
.macros-button .macros-button
height 60px height 60px
width 140px width 90px
font-weight normal font-weight normal
border-radius 10px border-radius 10px
margin-left 1rem margin-left 1rem
margin-top 1rem
border 0 border 0
color #fff color #fff
box-shadow rgba(0, 0, 0, 0.3) 0px 0px 5px box-shadow rgba(0, 0, 0, 0.3) 0px 0px 5px