0
1
Fork 0

Label & radio/checkbox issues fixed

This commit is contained in:
Juan 2018-05-17 13:22:13 +02:00
parent 177133b6c0
commit 3ca7bb7688
7 changed files with 51 additions and 169 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.405.97) stable; urgency=low
hedera-web (1.405.98) stable; urgency=low
* Initial Release.

View File

@ -88,31 +88,28 @@
/* Pay */
.confirm .amount-selector,
.confirm .pay-methods > div,
.confirm .pay-info
.confirm .pay-methods > div
{
display: none;
}
.confirm .pay-methods > div.selected > .pay-info
{
display: block;
}
.confirm .radio > div
.confirm .pay-methods > div
{
margin: .3em 0;
}
.confirm .radio > div > *
{
vertical-align: middle;
}
.confirm .radio > div > input[type=radio]
.confirm .pay-methods > div > label > input[type=radio]
{
margin: 0;
margin-right: .5em;
vertical-align: middle;
}
.confirm .pay-info
.confirm .pay-methods > div > div
{
padding: .5em 1.3em;
padding: .5em 1.5em;
display: none;
}
.confirm .pay-methods > div.selected > div
{
display: block;
}
.confirm .transfer-account
{
@ -122,4 +119,3 @@
{
margin: .1em 0;
}

View File

@ -22,9 +22,7 @@
</db-model>
</db-form>
<db-query id="confirm-query" on-ready="onConfirm">
<custom>
CALL basketConfirm
</custom>
CALL basketConfirm
</db-query>
</vn-group>
<div id="title">
@ -139,35 +137,43 @@
<h2>
<t>Pay method</t>
</h2>
<div class="pay-methods radio">
<div class="pay-methods">
<htk-radio-group
id="pay-method"
on-changed="onPayMethodChange"/>
<div id="balance-method">
<htk-radio radio-group="pay-method" value="BALANCE"/>
<label><t>Use my balance</t></label>
<div class="pay-info">
<label>
<htk-radio radio-group="pay-method" value="BALANCE"/>
<t>Use my balance</t>
</label>
<div>
<t>You have a favorable balance.</t>
</div>
</div>
<div id="credit-method">
<htk-radio radio-group="pay-method" value="CREDIT"/>
<label><t>Use my credit</t></label>
<div class="pay-info">
<label>
<htk-radio radio-group="pay-method" value="CREDIT"/>
<t>Use my credit</t>
</label>
<div>
<t>You have a favorable credit.</t>
</div>
</div>
<div id="card-method">
<htk-radio radio-group="pay-method" value="CARD"/>
<label><t>Credit card</t></label>
<div class="pay-info">
<label>
<htk-radio radio-group="pay-method" value="CARD"/>
<t>Credit card</t>
</label>
<div>
<t>You will be redirected to the payment.</t>
</div>
</div>
<div id="transfer-method">
<htk-radio radio-group="pay-method" value="TRANSFER"/>
<label><t>Bank Transfer</t></label>
<div class="pay-info">
<label>
<htk-radio radio-group="pay-method" value="TRANSFER"/>
<t>Bank Transfer</t>
</label>
<div>
<t>Make a transfer to one account.</t>
<htk-repeater form-id="iter">
<db-model property="model">
@ -183,8 +189,10 @@
</div>
</div>
<div id="later-method">
<htk-radio radio-group="pay-method" value="LATER"/>
<label><t>Pay later</t></label>
<label>
<htk-radio radio-group="pay-method" value="LATER"/>
<t>Pay later</t>
</label>
</div>
</div>
</div>

View File

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="20"
height="20"
viewBox="0 0 20 20"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="step-cur.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="41.1"
inkscape:cx="9.9756691"
inkscape:cy="10"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1032.3622)">
<circle
style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4138"
cx="10"
cy="1042.3622"
r="7.5" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="20"
height="20"
viewBox="0 0 20 20"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="step.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="41.1"
inkscape:cx="10"
inkscape:cy="10"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1032.3622)">
<circle
style="fill:#aaaaaa;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4138"
cx="10"
cy="1042.3622"
r="4" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -16,16 +16,22 @@
<div class="version-code"/>
</div>
<div class="form-group">
<label for="user"><t>User</t></label>
<input type="text" id="user" name="user"/>
<label>
<t>User</t>
<input type="text" id="user" name="user"/>
</label>
</div>
<div class="form-group">
<label for="pass"><t>Password</t></label>
<input type="password" id="pass" name="password"/>
<label>
<t>Password</t>
<input type="password" id="pass" name="password"/>
</label>
</div>
<div>
<input type="checkbox" id="remember" name="remember"/>
<label for="remember"><t>Do not sign out</t></label>
<label>
<input type="checkbox" id="remember" name="remember"/>
<t>Do not sign out</t>
</label>
</div>
<div class="enter">
<input id="submit" type="submit" value="_Enter"/>

View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "1.405.97",
"version": "1.405.98",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {