Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-21243 WordPress: logo in admin menu now uses SVG and works like others #118

Merged
merged 2 commits into from
Oct 1, 2017

Conversation

agh1
Copy link
Contributor

@agh1 agh1 commented Sep 30, 2017

@colemanw
Copy link
Member

@kcristiano can you do a quick test of this?

@kcristiano
Copy link
Member

@colemanw @agh1 I like the look as we now fllow the standard. Installed patch and works as expected. For reference https://developer.wordpress.org/reference/functions/add_menu_page/ details that adding the svg as a base64-encoded SVG using a data URI is compliant with the WP standards.

OK to merge from my perspective.

civicrm.php Outdated
@@ -737,17 +737,11 @@ public function enable_translation() {
*/
public function add_menu_items() {

$civilogo = 'data:image/svg+xml;base64,<?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"
   id="svg2"
   version="1.1"
   inkscape:version="0.91 r13725"
   xml:space="preserve"
   width="123.6097"
   height="123.6097"
   viewBox="0 0 123.60969 123.60971"
   sodipodi:docname="single-color.svg"
   inkscape:export-filename="/home/andrew/Records/civi-logo-16px.png"
   inkscape:export-xdpi="11.65"
   inkscape:export-ydpi="11.65"><metadata
     id="metadata8"><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><defs
     id="defs6"><clipPath
       clipPathUnits="userSpaceOnUse"
       id="clipPath16"><path
         d="M 0,432 864,432 864,0 0,0 0,432 Z"
         id="path18"
         inkscape:connector-curvature="0" /></clipPath><clipPath
       clipPathUnits="userSpaceOnUse"
       id="clipPath40"><path
         d="m 468.369,239.962 13.942,-12.093 -4.368,-48.881 2.52,-10.079 10.581,6.551 -1.51,12.429 49.721,27.214 4.703,8.005 -7.56,4.089 -23.349,1.847 -30.823,19.15 -13.857,1.847 0,-10.079 z"
         id="path42"
         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1551"
     inkscape:window-height="848"
     id="namedview4"
     showgrid="false"
     fit-margin-top="0.27744"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0.27744"
     inkscape:zoom="3.8236144"
     inkscape:cx="92.492891"
     inkscape:cy="46.577384"
     inkscape:window-x="67"
     inkscape:window-y="34"
     inkscape:window-maximized="0"
     inkscape:current-layer="g10" /><g
     id="g10"
     inkscape:groupmode="layer"
     inkscape:label="civi-logo-120312"
     transform="matrix(1.25,0,0,-1.25,-560.952,329.7706)"><path
       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a0a5aa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.71899986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
       d="m 478.47266,170.8457 c -2.33174,0.35539 -4.07491,1.93219 -4.9961,3.4043 -1.84238,2.94422 -1.7539,6.02539 -1.7539,6.02539 l -2.375,66.50977 c -0.10759,3.00163 0.44188,5.47223 1.92187,7.30859 1.47999,1.83636 3.71735,2.54905 5.45313,2.60547 3.47154,0.11284 6.09179,-1.51367 6.09179,-1.51367 l 58.20313,-31.12891 c 2.65115,-1.41821 4.51178,-3.14662 5.35742,-5.34766 0.84564,-2.20103 0.35639,-4.48964 -0.45312,-6.02929 -1.61904,-3.07932 -4.33008,-4.5625 -4.33008,-4.5625 l -55.83594,-35.25586 c -2.53966,-1.6033 -4.95147,-2.37101 -7.2832,-2.01563 z m 1.01172,6.64258 c 0.13238,-0.0202 0.96224,-0.032 2.68359,1.05469 l 55.83594,35.25586 c 0,0 1.54998,1.20762 1.9707,2.00781 0.21036,0.40009 0.18467,0.34703 0.12891,0.49219 -0.0558,0.14515 -0.46157,0.87324 -2.25391,1.83203 l -58.20313,31.13086 c 0,0 -1.82337,0.74936 -2.70507,0.7207 -0.44086,-0.0143 -0.35662,-2.6e-4 -0.44141,-0.10547 -0.0848,-0.1052 -0.51042,-0.8172 -0.4375,-2.85156 l 2.375,-66.50977 c 0,0 0.26871,-1.95389 0.73633,-2.70117 0.23381,-0.37363 0.17816,-0.30599 0.31055,-0.32617 z"
       id="path34"
       inkscape:connector-curvature="0" /><path
       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a0a5aa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.71899986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
       d="m 490.53516,166.75977 c -2.33989,-0.29607 -4.44561,0.73933 -5.73828,1.90039 -2.58536,2.32211 -3.35352,5.31054 -3.35352,5.31054 l -20.5957,63.1211 c -0.93175,2.85516 -1.08457,5.38335 -0.16993,7.55664 0.91486,2.1738 2.86527,3.47913 4.51758,4.01562 3.30463,1.07299 6.27539,0.23828 6.27539,0.23828 l 64.79883,-13.78906 c 2.93917,-0.62588 5.20438,-1.76398 6.62695,-3.64453 1.42258,-1.88055 1.58054,-4.21904 1.22266,-5.91992 -0.71575,-3.40176 -2.91797,-5.56641 -2.91797,-5.56641 l -44.20703,-49.29297 c -2.00614,-2.23685 -4.1191,-3.63362 -6.45898,-3.92968 z m -0.8418,6.66601 c 0.13924,0.0176 0.93996,0.23486 2.29883,1.75 l 44.20703,49.29297 c 0,0 1.15975,1.5884 1.34375,2.46289 0.092,0.43725 0.0843,0.36777 -0.004,0.48438 -0.0882,0.1166 -0.67863,0.70333 -2.66797,1.12695 l -64.79882,13.78906 c 0,0 -1.95842,0.21492 -2.80079,-0.0586 -0.42118,-0.13676 -0.34857,-0.10466 -0.40234,-0.23242 -0.0538,-0.12777 -0.26644,-0.93023 0.36524,-2.86524 l 20.5957,-63.12109 c 0,0 0.79443,-1.8031 1.45508,-2.39649 0.33032,-0.29669 0.26896,-0.25004 0.4082,-0.23242 z"
       id="path46"
       inkscape:connector-curvature="0" /></g></svg>';

Copy link
Member

@totten totten Sep 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for SVG.

A slight nitpick... this does add 18kb of inscrutable code in two source files, and they're duplicates, and they don't need to parsed/read on every page-request. It would make sense to do something like:

$civilogo = file_get_contents(__DIR__ . "civilog.svg.b64");

or maybe

$civilogo = 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(__DIR__ . "civilog.svg"));

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking about the second, but I didn't want to require the server to encode the file every time the admin menu appears. I never really thought about splitting the difference by going about it the first way, but I think I'll do that.

@agh1
Copy link
Contributor Author

agh1 commented Sep 30, 2017

@totten I just pulled the SVG to its own file and it appears to be working as well as before.

@kcristiano
Copy link
Member

@agh1 do we need file_get_contents since we are referencing an image file?

@agh1
Copy link
Contributor Author

agh1 commented Sep 30, 2017

@kcristiano yeah b/c it still needs to be an inline base64 image when it hits the browser. the last commit is just a housekeeping measure for internal purposes.

@colemanw
Copy link
Member

colemanw commented Oct 1, 2017

Cool.

@colemanw colemanw merged commit 6aefa6f into civicrm:master Oct 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants