fix add icons vcard CT#279

main/admin/user_information.php

@@ -53,7 +53,7 @@ if (api_is_platform_admin()) {
     );
     $vCardExportLink = Display::url(
         Display::return_icon(
-            'contact-vcard-icon.png', get_lang('Info'),'', ICON_SIZE_MEDIUM
+            'vcard.png', get_lang('UserInfo'),'', ICON_SIZE_MEDIUM
         ),
         api_get_path(WEB_PATH).'main/social/vcard_export.php?userId='.$user['user_id']
     );

main/img/icons/svg/vcard.svg

@@ -0,0 +1,260 @@
+<?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="120"
+   height="120"
+   viewBox="0 0 120 120"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="vcard.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4172">
+      <stop
+         style="stop-color:#70a9ad;stop-opacity:1"
+         offset="0"
+         id="stop4174" />
+      <stop
+         style="stop-color:#a3cad2;stop-opacity:1"
+         offset="1"
+         id="stop4176" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4162">
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="0"
+         id="stop4164" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4166" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4162"
+       id="linearGradient4168"
+       x1="66.549683"
+       y1="1035.0137"
+       x2="66.549683"
+       y2="952.11566"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2218072,0,0,1.1935911,-12.173437,-1124.5213)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4172"
+       id="linearGradient4178"
+       x1="35.476311"
+       y1="1001.0709"
+       x2="35.476311"
+       y2="970.58698"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1993158,0,0,1.1993158,-10.375607,-195.51155)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4262">
+      <path
+         style="opacity:1;fill:url(#linearGradient4266);fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -185.92437,-46.449824 19.83975,0 c 1.64197,0 2.96386,1.321887 2.96386,2.963861 l 0,19.981329 c 0,1.641983 -1.32189,2.963902 -2.96386,2.963902 l -19.83975,0 c -1.64198,0 -2.96387,-1.321919 -2.96387,-2.963902 l 0,-19.981329 c 0,-1.641974 1.32189,-2.963861 2.96387,-2.963861 z"
+         id="path4264"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4172"
+       id="linearGradient4266"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82759123,0,0,0.82759123,-206.83537,-848.95823)"
+       x1="35.476311"
+       y1="1001.0709"
+       x2="35.476311"
+       y2="970.58698" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.0666667"
+     inkscape:cx="123.82005"
+     inkscape:cy="64.022978"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <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" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-932.36213)">
+    <g
+       id="g4431"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/64/vcard.png"
+       inkscape:export-xdpi="48"
+       inkscape:export-ydpi="48">
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         ry="0"
+         y="932.36212"
+         x="0"
+         height="120"
+         width="120"
+         id="rect4287"
+         style="opacity:1;fill:#afdde9;fill-opacity:0;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         id="rect4136"
+         transform="translate(0,932.36213)"
+         d="M 14.695312 22.226562 C 9.792541 22.226562 5.8457031 26.173332 5.8457031 31.076172 L 5.8457031 88.923828 C 5.8457031 93.826228 9.792541 97.773437 14.695312 97.773438 L 32.332031 97.773438 A 7.94875 7.94875 0 0 1 32.253906 96.734375 A 7.94875 7.94875 0 0 1 40.203125 88.785156 A 7.94875 7.94875 0 0 1 48.150391 96.734375 A 7.94875 7.94875 0 0 1 48.074219 97.773438 L 74.332031 97.773438 A 7.94875 7.94875 0 0 1 74.253906 96.734375 A 7.94875 7.94875 0 0 1 82.203125 88.785156 A 7.94875 7.94875 0 0 1 90.150391 96.734375 A 7.94875 7.94875 0 0 1 90.074219 97.773438 L 105.30469 97.773438 C 110.20751 97.773438 114.1543 93.826228 114.1543 88.923828 L 114.1543 31.076172 C 114.1543 26.173332 110.20751 22.226562 105.30469 22.226562 L 14.695312 22.226562 z "
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         id="path4158"
+         transform="translate(0,932.36213)"
+         d="M 16.660156 24.654297 C 11.997283 24.654297 8.2441406 28.321803 8.2441406 32.876953 L 8.2441406 86.621094 C 8.2441406 91.176094 11.997283 94.84375 16.660156 94.84375 L 29.429688 94.84375 A 10.94875 10.94875 0 0 1 40.203125 85.785156 A 10.94875 10.94875 0 0 1 50.986328 94.84375 L 71.429688 94.84375 A 10.94875 10.94875 0 0 1 82.203125 85.785156 A 10.94875 10.94875 0 0 1 92.986328 94.84375 L 102.83594 94.84375 C 107.49878 94.84375 111.25391 91.176094 111.25391 86.621094 L 111.25391 32.876953 C 111.25391 28.321803 107.49878 24.654297 102.83594 24.654297 L 16.660156 24.654297 z "
+         style="opacity:1;fill:url(#linearGradient4168);fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         ry="4.2951221"
+         y="967.45496"
+         x="15.632731"
+         height="37.546474"
+         width="37.341305"
+         id="rect4170"
+         style="opacity:1;fill:url(#linearGradient4178);fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         ry="1.3338226"
+         y="970.01965"
+         x="61.854465"
+         height="8.8456783"
+         width="9.6932125"
+         id="rect4180"
+         style="opacity:1;fill:#526b79;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         style="opacity:1;fill:#526b79;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4182"
+         width="9.6932125"
+         height="8.8456783"
+         x="76.342438"
+         y="970.01965"
+         ry="1.3338226" />
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         ry="1.3338226"
+         y="970.01965"
+         x="90.830444"
+         height="8.8456783"
+         width="9.6932125"
+         id="rect4184"
+         style="opacity:1;fill:#526b79;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         inkscape:connector-curvature="0"
+         id="rect4188"
+         d="m 60.176006,988.06403 44.499954,0 c 0.55299,0 0.99818,0.44518 0.99818,0.99819 l 0,1.30503 c 0,0.553 -0.44519,0.99819 -0.99818,0.99819 l -44.499954,0 c -0.552995,0 -0.998191,-0.44519 -0.998191,-0.99819 l 0,-1.30503 c 0,-0.55301 0.445196,-0.99819 0.998191,-0.99819 z"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         inkscape:connector-curvature="0"
+         id="rect4190"
+         d="m 60.176006,1001.0479 44.499954,0 c 0.55299,0 0.99818,0.4451 0.99818,0.9981 l 0,1.3051 c 0,0.553 -0.44519,0.9982 -0.99818,0.9982 l -44.499954,0 c -0.552995,0 -0.998191,-0.4452 -0.998191,-0.9982 l 0,-1.3051 c 0,-0.553 0.445196,-0.9981 0.998191,-0.9981 z"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         clip-path="url(#clipPath4262)"
+         style="fill:#004455"
+         transform="matrix(1.4491642,0,0,1.4491642,289.36281,1034.7684)"
+         id="g4245">
+        <path
+           style="fill:#004455"
+           inkscape:connector-curvature="0"
+           d="m -162.671,-23.382 c -0.005,-1.228 -0.866,-1.256 -1.894,-1.668 l -4.801,-1.924 c -0.084,-0.033 -0.166,-0.068 -0.247,-0.104 l 0,-0.002 c -0.853,-0.387 -1.606,-0.924 -1.883,-1.303 l -0.011,-0.012 -0.003,-0.006 c -0.016,-0.023 -0.033,-0.049 -0.047,-0.072 l -0.011,-0.021 -0.003,-0.005 -0.01,-0.012 0,-0.002 c -0.128,-0.191 -0.257,-0.277 -0.366,-0.24 l -0.007,0.003 -0.003,0.001 -0.001,10e-4 -0.006,0.004 -0.004,0 -0.006,0.006 c -0.13,0.067 -0.104,-0.006 -0.157,-0.148 -0.13,-0.352 -0.344,-1.02 -0.377,-1.117 -0.05,-0.184 -0.184,0.289 -0.153,-0.221 l 0.056,-0.92 c 0.088,-0.096 0.159,-0.174 0.208,-0.228 0.313,-0.357 0.334,-1.303 0.49,-1.533 0.157,-0.23 0.472,-0.279 0.784,-1.354 0.314,-1.072 0.696,-2.605 0.293,-2.631 -0.099,-0.006 -0.211,0.059 -0.327,0.16 0.071,-0.394 0.221,-1.287 0.254,-1.947 0.046,-0.869 -0.099,-3.097 -0.593,-3.912 -0.309,-0.51 -0.932,-1.016 -1.553,-1.41 -0.372,-0.237 -0.743,-0.434 -1.047,-0.567 -0.905,-0.401 -3.757,-0.217 -4.724,0 -1.1,0.246 -1.871,0.937 -2.363,1.755 -0.492,0.817 -0.711,3.268 -0.668,4.137 0.021,0.39 0.254,1.047 0.313,1.449 0.034,0.209 0.065,0.211 0.091,0.36 -0.041,-0.017 -0.081,-0.024 -0.117,-0.022 -0.404,0.025 -0.022,1.558 0.291,2.631 0.313,1.072 0.627,1.123 0.783,1.354 0.157,0.23 0.18,1.176 0.493,1.533 0.05,0.058 0.125,0.139 0.219,0.238 l 0.061,0.752 0.105,0.418 c -0.048,-0.12 -0.144,-0.197 -0.188,-0.041 -0.135,0.41 -0.271,0.82 -0.405,1.23 -0.014,-0.021 -0.036,-0.033 -0.061,-0.035 -0.131,-0.115 -0.308,-0.016 -0.468,0.252 -0.236,0.396 -1.021,0.965 -1.932,1.375 l -0.013,0.049 -0.014,0.051 -0.005,0.021 c -0.071,0.03 -0.144,0.062 -0.217,0.09 l -4.8,1.924 c -1.027,0.41 -1.888,0.44 -1.895,1.668 l -0.795,4.181 28.801,0 -1.07,-4.181 0.003,-0.005 z"
+           id="path4247" />
+      </g>
+      <rect
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/vcard.png"
+         ry="1.0920637"
+         y="1012.7731"
+         x="16.540127"
+         height="3.7053933"
+         width="89.243469"
+         id="rect4334"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.41800001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <image
+       y="984.2984"
+       x="-95.386772"
+       id="image4376"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAhRJREFU
+OI3Nk71uE1EQhb+5e73edbz+IYkNcZwIIwEtr8ATUPIGlDwAL0BNSYlEQToQCAQFSEQCIehTBEGw
+FRNn7STe+GfXu/dS2BBBSwGnmZlmNOfoG/jXkjv33732C6Vr4TBZOp1mylgwWDJjMdaSWYsx8zkz
+lswaa8lm6fgkbO983tW1Srl568aVUjyz4uWd37f/2cu8TuLUmcTZ2s27T6bqIMpaSWrk4esu7TBh
+FFv2+ob2wNA5NnRPDL3IEo4ssww6/YR7T7scjWIVrG5cUuM4k3xO0bhQ4uWnHsenM+olIeeA6wiu
+FlwNFV/oDxO2tg+onCuxXMkjIGo8TQFonS+yXi/x4mOPo2jGSlHhanAdKHvCIErY2u6xslyi1Sgi
+dm5NjaYZANqB1lqR1WqBR2/aDKKEsicEntCPEh68alMuF2itFfH1WTZqNJlfIALpLMXTho1GhWcf
+enTCKZ1wyuP3PZqNCoGboWyKq8+S1eM4wwJJknIwiGjWA1w3R3fg8XZniAIuN6vUl31G04RuGLFS
+DbAWsIIeTVObGSu9fkRzNcD3cmDhYq3ARq2AALJgQxdcdC1g/3DIpOJjrbF6NOh8jZN08+q6L0Vf
+iagMtbAkIr8Y+MkBaDargfnyfZhEh519PTsN967ffl7NB8WlnOeIoxXKERwBpQSlFwsWVImIzdI4
+mZwc9cPd9re//IT/QT8ASF/1K70mQQMAAAAASUVORK5CYII=
+"
+       preserveAspectRatio="none"
+       height="20"
+       width="20" />
+  </g>
+</svg>

main/template/default/social/user_block.tpl

@@ -5,16 +5,18 @@
             <p class="firstname">{{ user.firstname }}</p>
             <p class="lastname">{{ user.lastname }}</p>
         </div>
+        <div class="social-avatar-email">
+            <a href="{{ _p.web }}main/messages/new_message.php">
+                <img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}">
+                {{ user.email}}
+            </a>
+        </div>
         <div class="social-avatar-vcard">
             <a href="{{ vCardUserLink }}">
-                <img src="{{ "contacts.png" | icon }}" atl="{{ "Info" | get_lang }}">
-                {{ "Info" | get_lang }}
+                <img src="{{ "vcard.png" | icon(22) }}" atl="{{ "UserInfo" | get_lang }}">
+                {{ "UserInfo" | get_lang }}
             </a>
         </div>
-        <div class="social-avatar-email">
-            <img src="{{ "instant_message.png" | icon }}" atl="{{ "Email" | get_lang }}">
-            {{ user.email}}
-        </div>
         {% if chat_enabled == 1 %}
             {% if user.user_is_online_in_chat != 0 %}
             <div class="social-avatar-chat">
@@ -31,12 +33,10 @@
             {% endif %}
         {% endif %}
         {% if not profileEditionLink is empty %}
-        <p>
-            <a class="btn btn-link" href="{{ profileEditionLink }}">
+            <a class="btn btn-default" href="{{ profileEditionLink }}">
                 <i class="fa fa-edit"></i>
                 {{ "EditProfile" | get_lang }}
             </a>
-        </p>
         {% endif %}
     </div>
 </div>