diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-12-08 08:35:18 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-12-08 08:35:18 +0000 |
| commit | 8c7d1a9be9582362eb86aeffaa082f13e7ac76bc (patch) | |
| tree | 2f9c632663b2c11ad6ad4ca837beaf9712ec463d | |
| parent | 0d3bb5d33c4fd8aa544a2c3a91ec53719558aa48 (diff) | |
| download | xxv-8c7d1a9be9582362eb86aeffaa082f13e7ac76bc.tar.gz xxv-8c7d1a9be9582362eb86aeffaa082f13e7ac76bc.tar.bz2 | |
* MEDIALIB: Add image if no actor image present
* MEDIALIB: Align image at middle
* STATUS: avoid some filter warning (is'nt numeric)
* RECORDS: don't use inotify as global object
* RECORDS: delayed preview image generation
| l--------- | skins/blue/images/noactor.gif | 1 | ||||
| l--------- | skins/blue/images/noactor.png | 1 | ||||
| -rw-r--r-- | skins/blue/style.css | 11 | ||||
| -rw-r--r-- | skins/blue_flat/style.css | 30 | ||||
| l--------- | skins/lcars/images/noactor.gif | 1 | ||||
| l--------- | skins/lcars/images/noactor.png | 1 | ||||
| -rw-r--r-- | skins/lcars/style.css | 11 | ||||
| -rw-r--r-- | skins/lcars_flat/style.css | 29 | ||||
| l--------- | skins/snow/images/noactor.gif | 1 | ||||
| l--------- | skins/snow/images/noactor.png | 1 | ||||
| -rw-r--r-- | skins/snow/style.css | 11 | ||||
| -rw-r--r-- | skins/snow_flat/style.css | 29 | ||||
| -rw-r--r-- | skins/stone/images/artwork/Makefile | 2 | ||||
| -rw-r--r-- | skins/stone/images/artwork/noactor.svg | 284 | ||||
| -rw-r--r-- | skins/stone/images/noactor.gif | bin | 0 -> 2702 bytes | |||
| -rw-r--r-- | skins/stone/images/noactor.png | bin | 0 -> 4320 bytes | |||
| -rw-r--r-- | skins/stone/memory.tmpl | 11 | ||||
| -rw-r--r-- | skins/stone/mldisplay.tmpl | 8 | ||||
| -rw-r--r-- | skins/stone/style.css | 12 | ||||
| -rw-r--r-- | skins/stone_flat/memory.tmpl | 12 | ||||
| -rw-r--r-- | skins/stone_flat/mldisplay.tmpl | 10 | ||||
| -rw-r--r-- | skins/stone_flat/style.css | 30 | ||||
| -rw-r--r-- | skins/xstyle/memory.tmpl | 14 |
23 files changed, 439 insertions, 71 deletions
diff --git a/skins/blue/images/noactor.gif b/skins/blue/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/blue/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif
\ No newline at end of file diff --git a/skins/blue/images/noactor.png b/skins/blue/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/blue/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png
\ No newline at end of file diff --git a/skins/blue/style.css b/skins/blue/style.css index f256350..8fd2045 100644 --- a/skins/blue/style.css +++ b/skins/blue/style.css @@ -101,14 +101,14 @@ width:120px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -116,7 +116,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/blue_flat/style.css b/skins/blue_flat/style.css index b91a415..3cce6ed 100644 --- a/skins/blue_flat/style.css +++ b/skins/blue_flat/style.css @@ -99,35 +99,43 @@ img.cover { width:120px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; + +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/lcars/images/noactor.gif b/skins/lcars/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/lcars/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif
\ No newline at end of file diff --git a/skins/lcars/images/noactor.png b/skins/lcars/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/lcars/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png
\ No newline at end of file diff --git a/skins/lcars/style.css b/skins/lcars/style.css index dd957e0..16aabd3 100644 --- a/skins/lcars/style.css +++ b/skins/lcars/style.css @@ -109,14 +109,14 @@ width:120px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -124,7 +124,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/lcars_flat/style.css b/skins/lcars_flat/style.css index d99743b..b353084 100644 --- a/skins/lcars_flat/style.css +++ b/skins/lcars_flat/style.css @@ -106,35 +106,42 @@ img.cover { width:120px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/snow/images/noactor.gif b/skins/snow/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/snow/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif
\ No newline at end of file diff --git a/skins/snow/images/noactor.png b/skins/snow/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/snow/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png
\ No newline at end of file diff --git a/skins/snow/style.css b/skins/snow/style.css index 179590e..5818bfc 100644 --- a/skins/snow/style.css +++ b/skins/snow/style.css @@ -101,14 +101,14 @@ width:130px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -116,7 +116,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/snow_flat/style.css b/skins/snow_flat/style.css index 0721842..b70989c 100644 --- a/skins/snow_flat/style.css +++ b/skins/snow_flat/style.css @@ -98,35 +98,42 @@ img.cover { width:110px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/stone/images/artwork/Makefile b/skins/stone/images/artwork/Makefile index f48ae09..ba944cb 100644 --- a/skins/stone/images/artwork/Makefile +++ b/skins/stone/images/artwork/Makefile @@ -8,7 +8,7 @@ IMAGES = ../on.gif ../delete.gif ../record.gif ../off.gif ../edit.gif \ ../home.gif ../refresh.gif ../onoff.gif ../movie.gif ../play.gif ../folder.gif \ ../select.gif ../deselect.gif ../invers.gif ../newfolder.gif \ ../cut.gif ../file.gif ../audio.gif ../topten.gif ../warning.gif \ -../imdb.gif ../ofdb.gif ../info.gif ../tvm.gif ../nocover.gif +../imdb.gif ../ofdb.gif ../info.gif ../tvm.gif ../nocover.gif ../noactor.gif ### Targets: diff --git a/skins/stone/images/artwork/noactor.svg b/skins/stone/images/artwork/noactor.svg new file mode 100644 index 0000000..a0b164b --- /dev/null +++ b/skins/stone/images/artwork/noactor.svg @@ -0,0 +1,284 @@ +<?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://web.resource.org/cc/" + 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="60" + height="90" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.45.1" + version="1.0" + sodipodi:docbase="/mnt/vdrsrc/xxv/devlop/XXV-Skins/stone/images/artwork" + sodipodi:docname="noactor.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/mnt/vdrsrc/xxv/devlop/XXV-Skins/stone/images/noactor.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <linearGradient + id="linearGradient3800"> + <stop + id="stop3802" + offset="0" + style="stop-color:#d3d3d3;stop-opacity:1;" /> + <stop + id="stop3804" + offset="1" + style="stop-color:#828282;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3816"> + <stop + id="stop3818" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3820" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3824"> + <stop + id="stop3826" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3828" + offset="1.0000000" + style="stop-color:#c9c9c9;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient4163"> + <stop + id="stop4165" + offset="0" + style="stop-color:#7b7b7b;stop-opacity:1;" /> + <stop + id="stop4167" + offset="1" + style="stop-color:#5e5e5e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient4356" + inkscape:collect="always"> + <stop + id="stop4358" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop4360" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3824" + id="linearGradient2401" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-12.41789,-7)" + x1="30.935921" + y1="29.553486" + x2="30.935921" + y2="35.803486" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient2403" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.977685,0.210075,0.210075,0.977685,41.80576,-11.11866)" + x1="22.686766" + y1="36.390400" + x2="21.408455" + y2="35.739632" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3816" + id="radialGradient2405" + gradientUnits="userSpaceOnUse" + cx="31.112698" + cy="19.008621" + fx="31.112698" + fy="19.008621" + r="8.6620579" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3816" + id="radialGradient2411" + gradientUnits="userSpaceOnUse" + cx="31.112698" + cy="19.008621" + fx="31.112698" + fy="19.008621" + r="8.6620579" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3800" + id="radialGradient2413" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.787998,0,0,0.787998,6.221198,3.617627)" + cx="29.344931" + cy="17.064077" + fx="29.344931" + fy="17.064077" + r="9.1620579" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient2420" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.9654467,0.4223152,0.4223152,1.9654467,78.492448,-18.374674)" + x1="22.686766" + y1="36.390400" + x2="21.408455" + y2="35.739632" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient2423" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.9768854,0.3650476,-0.3650476,1.9768854,-19.76709,-15.773853)" + x1="20.661695" + y1="35.817974" + x2="22.626925" + y2="36.217758" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3824" + id="linearGradient2432" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.0103067,0,0,2.0103067,-32.29475,-10.443594)" + x1="30.935921" + y1="29.553486" + x2="30.935921" + y2="35.803486" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4163" + id="radialGradient2435" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6085016,0,0,1.7787817,-49.097909,-0.5117356)" + cx="28.089741" + cy="27.203083" + fx="28.089741" + fy="27.203083" + r="13.565360" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.9926471" + inkscape:cx="50" + inkscape:cy="77.908996" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="60px" + height="90px" + inkscape:window-width="1195" + inkscape:window-height="950" + inkscape:window-x="0" + inkscape:window-y="0" /> + <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="Ebene 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g2309" + inkscape:label="cipek" + style="display:inline" + transform="matrix(2.0103067,0,0,2.0103067,-32.29475,-10.443594)"> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient2401);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 22.583894,27.034641 L 26.826534,27.034641 L 24.351661,24.736544 L 23.821331,25.443651 L 23.291,24.913321 L 22.583894,27.034641 z " + id="path4173" /> + <path + sodipodi:nodetypes="cccc" + id="path4370" + d="M 27.453661,32.743396 C 28.684912,32.162418 29.258041,30.741075 29.258041,30.741075 C 28.298921,26.698092 25.281892,23.898254 25.281892,23.898254 C 25.281892,23.898254 27.746485,30.240856 27.453661,32.743396 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient2403);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + </g> + <path + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + sodipodi:ry="8.6620579" + sodipodi:rx="8.6620579" + sodipodi:cy="19.008621" + sodipodi:cx="31.112698" + id="path4306" + style="color:#000000;fill:url(#radialGradient2405);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" + transform="matrix(3.5693196,0,0,1.928252,-81.051161,27.292939)" /> + <path + sodipodi:nodetypes="cczcczc" + id="path4308" + d="M 19.94543,73.257615 L 41.267953,73.257615 C 47.309335,73.257615 53.29056,71.042393 55.482966,64.728605 C 57.564918,58.732914 55.838342,47.315212 42.334079,38.075452 L 17.102426,38.075452 C 3.598162,46.60446 1.9105558,58.268643 5.019664,65.083979 C 8.1870931,72.027156 13.548672,73.257615 19.94543,73.257615 z " + style="color:#000000;fill:url(#radialGradient2435);fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2.0103066px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.21518986;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.01030612px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 19.802071,71.162662 L 40.897118,71.11824 C 46.20377,71.11824 51.457582,69.172426 53.383358,63.626497 C 55.212111,58.359976 53.192937,48.330849 41.331008,40.214792 L 18.162776,39.726151 C 6.3008465,47.217895 4.0049496,57.463527 6.7803609,63.938651 C 9.5557743,70.413774 13.605777,71.11824 19.802071,71.162662 z " + id="path4314" + sodipodi:nodetypes="cczcczc" /> + <path + transform="matrix(2.0103067,0,0,2.0103067,-32.546038,-3.4075201)" + sodipodi:type="arc" + style="color:#000000;fill:url(#radialGradient2411);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path4318" + sodipodi:cx="31.112698" + sodipodi:cy="19.008621" + sodipodi:rx="8.6620579" + sodipodi:ry="8.6620579" + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" /> + <path + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + sodipodi:ry="8.6620579" + sodipodi:rx="8.6620579" + sodipodi:cy="19.008621" + sodipodi:cx="31.112698" + id="path4320" + style="color:#000000;fill:url(#radialGradient2413);fill-opacity:1.0;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" + transform="matrix(2.0103067,0,0,2.0103067,-32.29475,-10.443594)" /> + <path + transform="matrix(1.76323,0,0,1.76323,-24.607484,-5.7469803)" + sodipodi:type="arc" + style="opacity:0.19620254;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.14012825px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path4322" + sodipodi:cx="31.112698" + sodipodi:cy="19.008621" + sodipodi:rx="8.6620579" + sodipodi:ry="8.6620579" + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" /> + <path + sodipodi:nodetypes="cccc" + id="path4354" + d="M 11.63405,71.527058 C 9.1259767,70.431503 8.0034476,67.791352 8.0034476,67.791352 C 9.6946804,59.61114 15.481638,53.626296 15.481638,53.626296 C 15.481638,53.626296 10.899504,66.515406 11.63405,71.527058 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient2423);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient2420);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 49.640319,69.801509 C 52.115511,68.633565 53.267676,65.77623 53.267676,65.77623 C 51.339551,57.648594 45.274398,52.020061 45.274398,52.020061 C 45.274398,52.020061 50.228985,64.770637 49.640319,69.801509 z " + id="path4364" + sodipodi:nodetypes="cccc" /> + </g> +</svg> diff --git a/skins/stone/images/noactor.gif b/skins/stone/images/noactor.gif Binary files differnew file mode 100644 index 0000000..79c3946 --- /dev/null +++ b/skins/stone/images/noactor.gif diff --git a/skins/stone/images/noactor.png b/skins/stone/images/noactor.png Binary files differnew file mode 100644 index 0000000..3dea6c3 --- /dev/null +++ b/skins/stone/images/noactor.png diff --git a/skins/stone/memory.tmpl b/skins/stone/memory.tmpl index c37bfd8..042dfb0 100644 --- a/skins/stone/memory.tmpl +++ b/skins/stone/memory.tmpl @@ -73,13 +73,20 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; USE my_graph = GD.Graph.pie(375, 375); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( axislabelclr => 'black', pie_height => 20, diff --git a/skins/stone/mldisplay.tmpl b/skins/stone/mldisplay.tmpl index 8cae113..acc6ddf 100644 --- a/skins/stone/mldisplay.tmpl +++ b/skins/stone/mldisplay.tmpl @@ -137,7 +137,13 @@ seen = f.25; <tr> <td class="fieldtext"> <div class="actor"> - <img class="actor" src='?cmd=mlcache&__source=<?% imgurl %?>' alt="<?% actor %?>" /> + <a href="?cmd=mlsearch&__search&__selfields=actors&__searchitem=<?% actor %?>"> + <?% IF imgurl %?> + <img class="actor" src="?cmd=mlcache&__source=<?% imgurl %?>" alt="<?% actor %?>" /> + <?% ELSE %?> + <img class="actor" src="images/noactor.<?% global.imagetyp %?>" alt="<?% actor %?>" /> + <?% END %?> + </a> </div> </td> </tr> diff --git a/skins/stone/style.css b/skins/stone/style.css index 6ec7e5a..a0fcea5 100644 --- a/skins/stone/style.css +++ b/skins/stone/style.css @@ -103,14 +103,14 @@ width:110px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -118,9 +118,13 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } + a img { border:0; } diff --git a/skins/stone_flat/memory.tmpl b/skins/stone_flat/memory.tmpl index f0b15e0..2fc2f1d 100644 --- a/skins/stone_flat/memory.tmpl +++ b/skins/stone_flat/memory.tmpl @@ -72,13 +72,21 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; + USE my_graph = GD.Graph.pie(500, 300); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( axislabelclr => 'black', pie_height => 20, diff --git a/skins/stone_flat/mldisplay.tmpl b/skins/stone_flat/mldisplay.tmpl index 04d311b..d05f9ff 100644 --- a/skins/stone_flat/mldisplay.tmpl +++ b/skins/stone_flat/mldisplay.tmpl @@ -136,9 +136,15 @@ seen = f.25; <?% FOREACH zeile = param.actors %?> <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% actor = zeile.0;imgurl=zeile.1 %?> - <div style="float:left"> + <div style="float:left;"> <div class="actor"> - <img class="actor" src="?cmd=mlcache&__source=<?% imgurl %?>" alt="<?% actor %?>" /> + <a href="?cmd=mlsearch&__search&__selfields=actors&__searchitem=<?% actor %?>"> + <?% IF imgurl %?> + <img class="actor" src="?cmd=mlcache&__source=<?% imgurl %?>" alt="<?% actor %?>" /> + <?% ELSE %?> + <img class="actor" src="images/noactor.<?% global.imagetyp %?>" alt="<?% actor %?>" /> + <?% END %?> + </a> </div> <div class="actortext"> <?% PROCESS item topic="actors" value=actor %?> diff --git a/skins/stone_flat/style.css b/skins/stone_flat/style.css index 175a24a..703292c 100644 --- a/skins/stone_flat/style.css +++ b/skins/stone_flat/style.css @@ -100,38 +100,46 @@ img.cover { width:100px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; vertical-align:middle; text-align:center; +display: table-cell; } + +div.actortext { +height:2em; +width:100px; +vertical-align:middle; +text-align:center; +} + a img { border:0; } diff --git a/skins/xstyle/memory.tmpl b/skins/xstyle/memory.tmpl index f0e7774..7c455d9 100644 --- a/skins/xstyle/memory.tmpl +++ b/skins/xstyle/memory.tmpl @@ -33,7 +33,7 @@ USE my_graph = GD.Graph.lines(500,300); # Xsteps - steps = param.stack.size / 5 | format('%d'); + steps = param.stack.size div 5; label = gettext('Memory usage since'); label = "${label} ${d.first.first}"; @@ -64,13 +64,21 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; + USE my_graph = GD.Graph.pie(400, 300); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( title => label, axislabelclr => 'black', |
