forked from verdnatura/hedera-web
Añadida columna Tallos, solucion errores
This commit is contained in:
Juan Ferrer Toribio
parent
a6a4ef3026
commit
9f9095a74e
|
|
@ -1,5 +1,5 @@
|
|||
Package: hedera-web
|
||||
Version: 1.0-34
|
||||
Version: 1.0-35
|
||||
Architecture: all
|
||||
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
|
||||
Depends: apache2, php5-mysql, php-vn-web
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ $conf = [
|
|||
**/
|
||||
'db' => [
|
||||
'host' => 'db.verdnatura.es'
|
||||
,'schema' => 'hedera'
|
||||
,'schema' => 'hedera-web'
|
||||
,'user' => 'root'
|
||||
,'pass' => 'base64pass'
|
||||
]
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@
|
|||
<htk-column-text title="Cat" column="Categoria" id="cat"/>
|
||||
<htk-column-text title="S1" column="Medida"/>
|
||||
<htk-column-text title="Color" column="Color"/>
|
||||
<htk-column-text title="Tallos" column="Tallos"/>
|
||||
<htk-column-text title="Origin" column="Abreviatura"/>
|
||||
</htk-grid>
|
||||
<p id="footer-message">
|
||||
|
|
|
|||
|
|
@ -104,8 +104,14 @@
|
|||
#basket-button
|
||||
{
|
||||
width: 100%;
|
||||
height: 3em;
|
||||
height: 2.5em;
|
||||
text-align: center;
|
||||
background-color: #00BCD4;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
#basket-button:hover
|
||||
{
|
||||
background-color: #0AB;
|
||||
}
|
||||
#catalog .form-group
|
||||
{
|
||||
|
|
@ -144,7 +150,7 @@
|
|||
#types-box
|
||||
{
|
||||
position: absolute;
|
||||
top: 17em;
|
||||
top: 16.8em;
|
||||
bottom: 0em;
|
||||
right: 0em;
|
||||
left: 0em;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="debt-popup">
|
||||
<htk-grid id="debt-grid">
|
||||
<htk-grid id="debt-grid" updatable="false">
|
||||
<db-model id="balance">
|
||||
CALL customer_debt ();
|
||||
</db-model>
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@ button.vn:hover
|
|||
text-align: left;
|
||||
min-width: 9em;
|
||||
min-height: 2.3em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* Float */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,78 @@
|
|||
<?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="252.26584"
|
||||
height="240.70886"
|
||||
id="svg3807"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.5 r10040"
|
||||
sodipodi:docname="Documento nuevo 3">
|
||||
<defs
|
||||
id="defs3809" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.077387447"
|
||||
inkscape:cx="-6444.7527"
|
||||
inkscape:cy="2199.2923"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1041"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata3812">
|
||||
<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(-227.53939,-348.0192)">
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="fill:#ffd600;stroke:none;stroke-width:2.00000000999999994;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
|
||||
id="path3817"
|
||||
sodipodi:sides="5"
|
||||
sodipodi:cx="167.2794"
|
||||
sodipodi:cy="430.68204"
|
||||
sodipodi:r1="132.07796"
|
||||
sodipodi:r2="59.435078"
|
||||
sodipodi:arg1="2.2086264"
|
||||
sodipodi:arg2="2.8369449"
|
||||
inkscape:flatsided="false"
|
||||
inkscape:rounded="0"
|
||||
inkscape:randomized="0"
|
||||
d="m 88.633116,536.79211 21.948034,-88.2821 -68.521465,-59.83522 90.743585,-6.40685 35.73238,-83.65789 34.13458,84.32245 90.60529,8.13181 -69.64725,58.52099 20.26477,88.68362 -77.17895,-48.15449 z"
|
||||
inkscape:transform-center-x="0.069378055"
|
||||
inkscape:transform-center-y="-12.54632"
|
||||
transform="matrix(0.99993715,-0.01121118,0.01121118,0.99993715,181.18676,51.836616)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
|
|
@ -20,8 +20,8 @@ Vn.Login =
|
|||
|
||||
var userEntry = document.getElementById ('user');
|
||||
|
||||
if (Vn.Cookie.check ('hedera_user'))
|
||||
userEntry.value = Vn.Cookie.get ('hedera_user');
|
||||
if (Vn.Cookie.check ('vn_user'))
|
||||
userEntry.value = Vn.Cookie.get ('vn_user');
|
||||
|
||||
userEntry.focus ();
|
||||
userEntry.select ();
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
*
|
||||
{
|
||||
font-family: 'Open Sans';
|
||||
font-size: 10pt;
|
||||
}
|
||||
div
|
||||
{
|
||||
position: absolute;
|
||||
width: 500px;
|
||||
height: 100px;
|
||||
margin-left: -250px;
|
||||
margin-top: -50px;
|
||||
width: 48em;
|
||||
height: 10em;
|
||||
margin-left: -24em;
|
||||
margin-top: -5em;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
text-align: center;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
img
|
||||
{
|
||||
position: absolute;
|
||||
margin-top: -200px;
|
||||
margin-left: -200px;
|
||||
margin-top: -18em;
|
||||
margin-left: -18em;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,16 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<title>No disponible - Verdnatura</title>
|
||||
<style type="text/css">
|
||||
body
|
||||
{
|
||||
font-size: 16pt;
|
||||
}
|
||||
div
|
||||
{
|
||||
position: absolute;
|
||||
width: 600px;
|
||||
margin-top: -80px;
|
||||
margin-left: -300px;
|
||||
width: 55em;
|
||||
margin-top: -7em;
|
||||
margin-left: -26em;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
text-align: center;
|
||||
|
|
|
|||
Loading…
Reference in New Issue