Skip to content

B
branding-etersoft-ximper
Commit fd056c63 authored by Alexandra Panyukova's avatar Alexandra Panyukova
Browse files
Options

Merge remote branch 'inger/master' into P5

Conflicts: components/ahttpd/styles/alterator.css.in
parents 5fca737f 38172ca0
Show whitespace changes
Inline Side-by-side
Showing with 556 additions and 34 deletions
components/ahttpd/images/close-dialog-button.svg 0 → 100644
View file @ fd056c63
<?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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22.088934"
height="22.084892"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.47pre2 r22153"
version="1.0"
sodipodi:docname="dialog_close.svg"
inkscape:output_extension="org.inkscape.output.svgz.inkscape"
inkscape:export-filename="/home/pinheiro/pics/oxygen/scalable/actions/dialog-close.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 64 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="128 : 64 : 1"
inkscape:persp3d-origin="64 : 42.666667 : 1"
id="perspective62" />
<linearGradient
id="linearGradient4296">
<stop
id="stop4298"
offset="0"
style="stop-color:#ff0000;stop-opacity:1;" />
<stop
id="stop4300"
offset="1"
style="stop-color:#650000;stop-opacity:1;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4296"
id="linearGradient4272"
gradientUnits="userSpaceOnUse"
x1="328.12448"
y1="120.81158"
x2="336.98077"
y2="87.759453" />
<linearGradient
id="linearGradient7321">
<stop
style="stop-color:#8c0000;stop-opacity:1;"
offset="0"
id="stop7323" />
<stop
style="stop-color:#650000;stop-opacity:1;"
offset="1"
id="stop7325" />
</linearGradient>
<linearGradient
id="linearGradient6740">
<stop
style="stop-color:#4d0000;stop-opacity:0;"
offset="0"
id="stop6742" />
<stop
id="stop6748"
offset="0.5"
style="stop-color:#4d0000;stop-opacity:1;" />
<stop
style="stop-color:#4d0000;stop-opacity:0;"
offset="1"
id="stop6744" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
y2="-383.9971"
x2="-12.0029"
y1="-383.9971"
x1="-84.002403"
gradientUnits="userSpaceOnUse"
id="linearGradient5958">
<stop
id="stop5960"
style="stop-color:#8c0000;stop-opacity:1;"
offset="0" />
<stop
id="stop5962"
style="stop-color:#bf0000;stop-opacity:1;"
offset="1" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
y2="-383.9971"
x2="-12.0029"
y1="-383.9971"
x1="-84.002403"
gradientUnits="userSpaceOnUse"
id="linearGradient4770">
<stop
id="stop4772"
style="stop-color:#ffbe00;stop-opacity:1"
offset="0" />
<stop
id="stop4774"
style="stop-color:#f5d600;stop-opacity:0;"
offset="1" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
y2="-383.9975"
x2="-23.516129"
y1="-383.9971"
x1="-84.002403"
gradientUnits="userSpaceOnUse"
id="linearGradient3711">
<stop
id="stop3713"
style="stop-color:white;stop-opacity:1;"
offset="0" />
<stop
id="stop3715"
style="stop-color:white;stop-opacity:0;"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient3290">
<stop
style="stop-color:yellow;stop-opacity:1;"
offset="0"
id="stop3292" />
<stop
style="stop-color:#ffb66d;stop-opacity:1;"
offset="1"
id="stop3294" />
</linearGradient>
<linearGradient
id="linearGradient1563">
<stop
id="stop1565"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop1567"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient3273">
<stop
id="stop3275"
offset="0"
style="stop-color:#ffffff;stop-opacity:0.55035973;" />
<stop
id="stop3277"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath5163">
<circle
sodipodi:ry="36"
sodipodi:rx="36"
sodipodi:cy="92"
sodipodi:cx="343.99899"
style="fill:url(#linearGradient5167);fill-opacity:1"
r="36"
rx="8.0010004"
cx="343.99899"
cy="92"
ry="8.0010004"
id="circle5165" />
</clipPath>
<filter
inkscape:collect="always"
id="filter5943"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.04"
id="feGaussianBlur5945" />
</filter>
<filter
inkscape:collect="always"
id="filter7317"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="2.8805897"
id="feGaussianBlur7319" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7321"
id="linearGradient8922"
gradientUnits="userSpaceOnUse"
x1="351.02234"
y1="65.788521"
x2="309.21854"
y2="82.680611" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4296"
id="linearGradient2390"
gradientUnits="userSpaceOnUse"
x1="328.12448"
y1="120.81158"
x2="336.98077"
y2="87.759453" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4296"
id="linearGradient2997"
gradientUnits="userSpaceOnUse"
x1="328.12448"
y1="120.81158"
x2="336.98077"
y2="87.759453" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3711"
id="linearGradient3003"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
x1="-80.00296"
y1="-131.93112"
x2="-45.096584"
y2="-131.93112" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6740"
id="linearGradient3008"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(20.000035,-56.000003)"
x1="117.81589"
y1="103.01254"
x2="90.537666"
y2="76.633896" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4296"
id="linearGradient3010"
gradientUnits="userSpaceOnUse"
x1="328.12448"
y1="120.81158"
x2="336.98077"
y2="87.759453" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4770"
id="radialGradient3012"
gradientUnits="userSpaceOnUse"
cx="345.80753"
cy="85.250488"
fx="345.80753"
fy="85.250488"
r="36"
gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5958"
id="linearGradient3014"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
x1="-86.120354"
y1="-381.09921"
x2="-56.357521"
y2="-373.1243" />
<filter
inkscape:collect="always"
id="filter3138"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="5.6513927"
id="feGaussianBlur3140" />
</filter>
<filter
inkscape:collect="always"
id="filter3162"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.96794009"
id="feGaussianBlur3164" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5958"
id="linearGradient2878"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
x1="-86.120354"
y1="-381.09921"
x2="-56.357521"
y2="-373.1243" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4770"
id="radialGradient2880"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)"
cx="345.80753"
cy="85.250488"
fx="345.80753"
fy="85.250488"
r="36" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4296"
id="linearGradient2882"
gradientUnits="userSpaceOnUse"
x1="328.12448"
y1="120.81158"
x2="336.98077"
y2="87.759453" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3711"
id="linearGradient2884"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
x1="-80.00296"
y1="-131.93112"
x2="-45.096584"
y2="-131.93112" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6740"
id="linearGradient2886"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(20.000035,-56.000003)"
x1="117.81589"
y1="103.01254"
x2="90.537666"
y2="76.633896" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="9.01806"
inkscape:cy="12.37148"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1024"
inkscape:window-height="697"
inkscape:window-x="107"
inkscape:window-y="70"
showgrid="true"
inkscape:grid-points="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="0">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="4px"
spacingy="4px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<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" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-3.2427146,-50.107128)">
<g
id="g2868"
transform="matrix(0.17079235,0,0,0.17076092,3.2683312,49.899927)">
<path
transform="matrix(0.5662048,0,0,0.5662048,55.73989,54.555422)"
d="m 115.5,20 c 0,55.228475 -44.771525,100 -100,100 -55.228475,0 -100,-44.771525 -100,-100 0,-55.228475 44.771525,-100 100,-100 55.228475,0 100,44.771525 100,100 z"
sodipodi:ry="100"
sodipodi:rx="100"
sodipodi:cy="20"
sodipodi:cx="15.5"
id="path2396"
style="opacity:0.50271738;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4.15;filter:url(#filter3138)"
sodipodi:type="arc" />
<circle
transform="matrix(-1.5639433,0.4190574,-0.4190574,-1.5639433,641.54821,62.027543)"
id="circle3581_2_"
ry="8.0010004"
cy="92"
cx="343.99899"
rx="8.0010004"
r="36"
style="fill:url(#linearGradient2878);fill-opacity:1"
sodipodi:cx="343.99899"
sodipodi:cy="92"
sodipodi:rx="36"
sodipodi:ry="36"
d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
<circle
sodipodi:ry="36"
sodipodi:rx="36"
sodipodi:cy="92"
sodipodi:cx="343.99899"
style="fill:url(#radialGradient2880);fill-opacity:1;filter:url(#filter3162)"
r="36"
rx="8.0010004"
cx="343.99899"
cy="92"
ry="8.0010004"
id="circle4383"
transform="matrix(-1.1729576,0.3142929,-0.3142929,-1.1729576,497.41122,62.095683)"
d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
<circle
sodipodi:ry="36"
sodipodi:rx="36"
sodipodi:cy="92"
sodipodi:cx="343.99899"
style="opacity:0.8;fill:none;stroke:url(#linearGradient2882);stroke-width:6.75138187;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter7317)"
r="36"
rx="8.0010004"
cx="343.99899"
cy="92"
ry="8.0010004"
id="circle4776"
transform="matrix(-1.5639433,-0.4190574,-0.4190574,1.5639433,641.54821,62.572542)"
clip-path="url(#clipPath5163)"
d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
<path
id="circle16776"
d="m 65.000079,11.557516 c -20.67048,0 -37.942548,14.596148 -42.105568,34.029379 8.298024,7.735491 24.043093,12.955554 42.105568,12.955554 18.062496,0 33.807544,-5.220063 42.105561,-12.955554 -4.163,-19.433231 -21.435087,-34.029379 -42.105561,-34.029379 z"
style="opacity:0.8;fill:url(#linearGradient2884);fill-opacity:1" />
<g
transform="matrix(1.2882604,1.2882604,-1.2882604,1.2882604,-45.790405,-141.24514)"
id="g6850">
<path
id="path4123"
d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
style="fill:none;stroke:url(#linearGradient2886);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter5943)"
sodipodi:nodetypes="ccccccccccccc" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
id="rect3232"
sodipodi:nodetypes="ccccccccccccc" />
</g>
</g>
</g>
</svg>
components/ahttpd/styles/alterator.css.in
View file @ fd056c63
......@@ -66,17 +66,18 @@ textarea, select, input.text {
background-color: #@MIDDLE_LABELS_HEX@;
}
.box {
position: relative;
width: 780px;
margin-top: 10px;
.frame-table {
border-style:solid;
border-width:1px;
margin: 3px;
}
background: #FFFFFF;
padding: 0.2em;
padding-right: 2mm;
padding-top: 2mm;
padding-bottom: 2mm;
.frame-table td, .frame-table th {
border-style:solid;
border-width:1px;
padding: 1px 1px 3px 3px;
border: 1px solid #@MIDDLE_COLOR_HEX@;
}
.disabled {
......@@ -120,6 +121,14 @@ textarea, select, input.text {
background: url(/design/images/last-page-button.png) no-repeat;
}
.close-dialog-button {
width: 22px;
height: 22px;
border: 0px;
cursor: pointer;
background: url(/design/images/close-dialog-button.png) no-repeat;
}
/* messages */
.alterator-information-message {
......@@ -277,31 +286,6 @@ canvas.alterator-clock {
border-radius: 4px;
}
/* help popup */
#help-popup {
padding-left: 10px;
padding-right: -30px;
background-color: #@LIGHT_COLOR_HEX@;
border: 1px solid #@DARK_COLOR_HEX@;;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
-khtml-border-radius: 0.5em;
border-radius: 0.5em;
}
.hresizeable {
width: 100%;
height: 7px;
background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
cursor: s-resize;
}
.hresizeable:hover {
background-color: #@DARK_COLOR_HEX@;
}
/* tables */
table.alterator-listbox {
......@@ -341,6 +325,29 @@ table.alterator-listbox tbody tr.odd td {
background-color:#@LIGHT_COLOR_HEX@;
}
table.alterator-listbox tbody tr.selected td, table.alterator-listbox tbody tr.odd.selected td {
background-color: #D0E1FF;
border-top: #ffffff solid 1px;
}
table.alterator-listbox tbody tr.error td {
background-color: #e6999b;
font-weight: bold;
}
table.alterator-listbox tbody tr.odd.error td {
background-color: #e68b8d;
font-weight: bold;
}
table.alterator-listbox tbody tr.working td {
background-color: #f2ecbd;
}
table.alterator-listbox tbody tr.odd.working td {
background-color: #f2e88f;
}
table.alterator-listbox thead tr .headerSortUp {
background-image: url(/design/images/asc.gif);
}
......@@ -380,6 +387,32 @@ div.alterator-accordion h3.ui-state-active {
background-image: url(/design/images/asc.gif);
}
/* resizeable */
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: 0px;
left: 0px;
background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
}
.ui-resizable-s:hover {
background-color: #@DARK_COLOR_HEX@;
}
/* help button */
.ui-help-button {
background-color: #@LIGHT_COLOR_HEX@;
}
.ui-help-button-content {
padding-left: 10px;
padding-right: 30px;
}
/* top line */
#top {
......@@ -426,3 +459,20 @@ div.alterator-accordion h3.ui-state-active {
padding-right:10px;
margin-bottom:10px;
}
#help-popup {
padding-left: 10px;
width: 95%;
background-color: #@LIGHT_COLOR_HEX@;
}
.hresizeable {
width: 100%;
height: 7px;
background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
cursor: s-resize;
}
.hresizeable:hover {
background-color: #@DARK_COLOR_HEX@;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment