Skip to content

GitLab

Commit aa683105 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch 'cherry-pick-8359219e' into '1.2.3-fixes' 

Merge branch '5939-create-icons-for-ipmi-and-weblink' into '1.2.3-fixes'

See merge request fusiondirectory/fd-plugins!509
parents 26effdac 2d8561d5
Hide whitespace changes
Inline Side-by-side
ipmi/admin/systems/ipmi/class_ipmiClient.inc
View file @ aa683105
......@@ -30,6 +30,8 @@ class ipmiClient extends simplePlugin
return array(
'plShortName' => _('IPMI client'),
'plDescription' => _('Edit IPMI client settings'),
'plIcon' => 'geticon.php?context=applications&icon=ipmi&size=48',
'plSmallIcon' => 'geticon.php?context=applications&icon=ipmi&size=16',
'plSelfModify' => FALSE,
'plCategory' => array('workstation','server'),
'plObjectType' => array('workstation','server'),
......
ipmi/html/themes/breezy/svg/16/apps/ipmi.svg 0 → 100644
View file @ aa683105
<?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="16"
height="16"
id="svg3049"
version="1.1"
sodipodi:docname="ipmi.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
inkscape:export-filename="ipmi.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1884"
inkscape:window-height="1051"
id="namedview12"
showgrid="true"
inkscape:zoom="14.75"
inkscape:cx="-6.5762708"
inkscape:cy="4.3389831"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="text829">
<inkscape:grid
type="xygrid"
id="grid822" />
</sodipodi:namedview>
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#4d4d4d;
}
.ColorScheme-Background {
color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
}
</style>
</defs>
<metadata
id="metadata3054">
<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:date>2019</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Timothée Giet</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
aria-label="IPMI"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
id="text829">
<path
d="M 0,11 H 0.9866666 V 6 H 0 Z"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.66666651px;font-family:'Source Han Sans';-inkscape-font-specification:'Source Han Sans Bold';letter-spacing:0px;fill:#3daee9;fill-opacity:1;stroke-width:1.00605464"
id="path831"
inkscape:connector-curvature="0" />
<path
d="M 3,11 H 3.9866667 V 9.2253713 h 0.66 c 1.0599999,0 1.9066666,-0.5128206 1.9066666,-1.6531715 C 6.5533333,6.391363 5.7133333,6 4.62,6 H 3 Z M 3.9866667,8.4358976 V 6.7962213 h 0.56 c 0.68,0 1.0399999,0.1956816 1.0399999,0.7759785 C 5.5866666,8.1457491 5.26,8.4358976 4.58,8.4358976 Z"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.66666651px;font-family:'Source Han Sans';-inkscape-font-specification:'Source Han Sans Bold';letter-spacing:0px;fill:#3daee9;fill-opacity:1;stroke-width:1.00605464"
id="path833"
inkscape:connector-curvature="0" />
<path
d="M 8.1133334,11 H 9 V 8.9149799 C 9,8.4426452 8.92,7.7476384 8.8733334,7.2753037 h 0.026667 L 9.2933334,8.4493928 10.06,10.547909 h 0.566666 l 0.76,-2.0985162 0.4,-1.1740891 h 0.03333 c -0.05333,0.4723347 -0.126663,1.1673415 -0.126663,1.6396762 V 11 h 0.9 V 6 H 11.5 l -0.82,2.3414307 c -0.106667,0.3103913 -0.193334,0.6410256 -0.3,0.9581646 h -0.03333 c -0.1,-0.317139 -0.193333,-0.6477733 -0.299999,-0.9581646 L 9.2066707,6 H 8.1133334 Z"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.66666651px;font-family:'Source Han Sans';-inkscape-font-specification:'Source Han Sans Bold';letter-spacing:0px;fill:#3daee9;fill-opacity:1;stroke-width:1.00605464"
id="path835"
inkscape:connector-curvature="0" />
<path
d="M 15.013334,11 H 16 V 6 h -0.986666 z"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.66666651px;font-family:'Source Han Sans';-inkscape-font-specification:'Source Han Sans Bold';letter-spacing:0px;fill:#3daee9;fill-opacity:1;stroke-width:1.00605464"
id="path837"
inkscape:connector-curvature="0" />
<path
style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 8,0 A 8,8 0 0 0 1.0839844,4 H 2.2578125 A 7,7 0 0 1 8,1 7,7 0 0 1 13.734375,4 h 1.185547 A 8,8 0 0 0 8,0 Z M 1.7636719,13 A 8,8 0 0 0 8,16 8,8 0 0 0 14.244141,13 H 12.896484 A 7,7 0 0 1 8,15 7,7 0 0 1 3.1113281,13 Z"
id="path840"
inkscape:connector-curvature="0" />
</g>
</svg>
ipmi/html/themes/breezy/svg/48/apps/ipmi.svg 0 → 100644
View file @ aa683105
<?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="48"
height="48"
id="svg5453"
version="1.1"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ipmi.svg"
inkscape:export-filename="ipmi.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs5455">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#4d4d4d;
}
.ColorScheme-Background {
color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
}
</style>
<linearGradient
inkscape:collect="always"
id="linearGradient4227-0-8">
<stop
style="stop-color:#292c2f;stop-opacity:1"
offset="0"
id="stop4229-3-3" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4231-90-8" />
</linearGradient>
<linearGradient
gradientTransform="matrix(1.4285726,0,0,1.4285726,-163.67389,-235.91398)"
inkscape:collect="always"
xlink:href="#linearGradient4303"
id="linearGradient4171"
gradientUnits="userSpaceOnUse"
x1="399.57144"
y1="545.79797"
x2="399.57144"
y2="517.79797" />
<linearGradient
inkscape:collect="always"
id="linearGradient4303">
<stop
style="stop-color:#c6cdd1;stop-opacity:1"
offset="0"
id="stop4305" />
<stop
style="stop-color:#e0e5e7;stop-opacity:1"
offset="1"
id="stop4307" />
</linearGradient>
<style
id="current-color-scheme-7"
type="text/css">
.ColorScheme-Text {
color:#4d4d4d;
}
.ColorScheme-Background {
color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
}
</style>
<style
id="current-color-scheme-75"
type="text/css">
.ColorScheme-Text {
color:#4d4d4d;
}
.ColorScheme-Background {
color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
}
</style>
<style
id="current-color-scheme-3"
type="text/css">
.ColorScheme-Text {
color:#4d4d4d;
}
.ColorScheme-Background {
color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
}
</style>
<linearGradient
id="linearGradient4143"
inkscape:collect="always">
<stop
id="stop4145"
offset="0"
style="stop-color:#197cf1;stop-opacity:1" />
<stop
id="stop4147"
offset="1"
style="stop-color:#20bcfa;stop-opacity:1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4227-0-8"
id="linearGradient965"
gradientUnits="userSpaceOnUse"
x1="400.57144"
y1="515.79797"
x2="420.57144"
y2="535.79797"
gradientTransform="translate(-60)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4143"
id="linearGradient877"
x1="23"
y1="27"
x2="23"
y2="22"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5,0,0,1.5,372.57143,487.798)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4227-0-8"
id="linearGradient887"
x1="400.57147"
y1="519.79797"
x2="419.57144"
y2="538.79797"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-384.57143,-499.798)" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="5.655"
inkscape:cx="26.604755"
inkscape:cy="10.736975"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1884"
inkscape:window-height="1051"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
showguides="true"
inkscape:object-nodes="true"
inkscape:snap-global="true">
<inkscape:grid
type="xygrid"
id="grid4063" />
<sodipodi:guide
position="1.1650391e-05,47.999996"
orientation="4,0"
id="guide4146"
inkscape:locked="false" />
<sodipodi:guide
position="1.1650391e-05,43.999996"
orientation="0,48"
id="guide4148"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,43.999996"
orientation="-4,0"
id="guide4150"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,47.999996"
orientation="0,-48"
id="guide4152"
inkscape:locked="false" />
<sodipodi:guide
position="1.1650391e-05,4.0000264"
orientation="4,0"
id="guide4154"
inkscape:locked="false" />
<sodipodi:guide
position="1.1650391e-05,2.6367188e-05"
orientation="0,48"
id="guide4156"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,2.6367188e-05"
orientation="-4,0"
id="guide4158"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,4.0000264"
orientation="0,-48"
id="guide4160"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,48.000026"
orientation="0,-4"
id="guide4162"
inkscape:locked="false" />
<sodipodi:guide
position="44.000012,48.000026"
orientation="48,0"
id="guide4164"
inkscape:locked="false" />
<sodipodi:guide
position="44.000012,2.6367188e-05"
orientation="0,4"
id="guide4166"
inkscape:locked="false" />
<sodipodi:guide
position="48.000012,2.6367188e-05"
orientation="-48,0"
id="guide4168"
inkscape:locked="false" />
<sodipodi:guide
position="4.0000422,48.000026"
orientation="0,-4"
id="guide4170"
inkscape:locked="false" />
<sodipodi:guide
position="4.2167969e-05,48.000026"
orientation="48,0"
id="guide4172"
inkscape:locked="false" />
<sodipodi:guide
position="4.2167969e-05,2.6367188e-05"
orientation="0,4"
id="guide4174"
inkscape:locked="false" />
<sodipodi:guide
position="4.0000422,2.6367188e-05"
orientation="-48,0"
id="guide4176"
inkscape:locked="false" />
<sodipodi:guide
position="20.000012,43.999996"
orientation="39.999969,0"
id="guide4153"
inkscape:locked="false" />
<sodipodi:guide
position="20.000012,4.0000264"
orientation="0,8"
id="guide4155"
inkscape:locked="false" />
<sodipodi:guide
position="28.000012,4.0000264"
orientation="-39.999969,0"
id="guide4157"
inkscape:locked="false" />
<sodipodi:guide
position="28.000012,43.999996"
orientation="0,-8"
id="guide4159"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5458">
<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>
<dc:date>2019</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Timothée Giet</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-384.57143,-499.798)">
<circle
style="opacity:1;fill:url(#linearGradient4171);fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3377"
cx="408.57138"
cy="523.79797"
r="19.999956" />
<path
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.66666651px;line-height:1.25;font-family:'Source Han Sans';-inkscape-font-specification:'Source Han Sans Bold';letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient877);fill-opacity:1;stroke:none;stroke-width:1.50908196"
d="m 396.57143,520.798 v 7.5 h 1.47949 v -7.5 z m 4.5,0 v 7.5 h 1.47949 v -2.66309 h 0.99024 c 1.59,0 2.85937,-0.76799 2.85937,-2.47851 0,-1.77126 -1.26039,-2.3584 -2.90039,-2.3584 z m 7.66992,0 v 7.5 h 1.33008 v -3.12891 c 0,-0.70849 -0.12042,-1.74949 -0.19043,-2.458 h 0.041 l 0.58887,1.76074 1.15136,3.14941 h 0.84961 l 1.13965,-3.14941 0.60059,-1.76074 h 0.0498 c -0.0799,0.70851 -0.19043,1.74951 -0.19043,2.458 v 3.12891 h 1.3506 v -7.5 h -1.64063 l -1.23047,3.5127 c -0.16,0.46558 -0.28824,0.95983 -0.44824,1.43554 h -0.0498 c -0.15,-0.47571 -0.29117,-0.96996 -0.45117,-1.43554 l -1.25977,-3.5127 z m 10.35059,0 v 7.5 h 1.47949 v -7.5 z m -16.54102,1.19531 h 0.84082 c 1.02,0 1.5586,0.29264 1.5586,1.16309 0,0.86032 -0.48879,1.29492 -1.50879,1.29492 h -0.89063 z"
id="path831"
inkscape:connector-curvature="0" />
<path
style="opacity:0.2;fill:url(#linearGradient887);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 33.308594,31.513672 26,35 H 20 L 15.021484,32 26.767578,43.785156 A 19.999956,19.999956 0 0 0 39,37.205078 Z"
transform="translate(384.57143,499.798)"
id="path879"
inkscape:connector-curvature="0" />
<path
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;opacity:1;vector-effect:none;fill:#858585;fill-opacity:1;stroke:none;stroke-width:7.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 408.57143,511.798 a 12,12 0 0 0 -10.37403,6 h 1.76074 a 10.5,10.5 0 0 1 8.61329,-4.5 10.5,10.5 0 0 1 8.60157,4.5 h 1.77831 a 12,12 0 0 0 -10.37988,-6 z m -9.3545,19.5 a 12,12 0 0 0 9.3545,4.5 12,12 0 0 0 9.36621,-4.5 h -2.02149 a 10.5,10.5 0 0 1 -7.34472,3 10.5,10.5 0 0 1 -7.33301,-3 z"
id="path840"
inkscape:connector-curvature="0" />
</g>
</svg>
weblink/admin/systems/weblink/class_webLink.inc
View file @ aa683105
......@@ -30,6 +30,8 @@ class webLink extends simplePlugin
return array(
'plShortName' => _('Web link'),
'plDescription' => _('Edit web link'),
'plIcon' => 'geticon.php?context=applications&icon=weblink&size=48',
'plSmallIcon' => 'geticon.php?context=applications&icon=weblink&size=16',
'plSelfModify' => FALSE,
'plObjectType' => array('workstation','server','ipmi','component','printer'),
......
weblink/html/themes/breezy/svg/16/apps/weblink.svg 0 → 100644
View file @ aa683105
<?xml version="1.0" encoding="UTF-8" standalone="no"?>