Merge pull request #1287 from aragonc/1.11.x

1.11.x
8 years ago · c0d0d0846f
parent 5ce4ebfab0 a420befff2
commit c0d0d0846f
5 changed files with 97 additions and 93 deletions
--- a/main/img/icons/22/save_pack.png
+++ b/main/img/icons/22/save_pack.png
--- a/main/img/icons/32/save_pack.png
+++ b/main/img/icons/32/save_pack.png
--- a/main/img/icons/48/save_pack.png
+++ b/main/img/icons/48/save_pack.png
--- a/main/img/icons/svg/save_pack.svg
+++ b/main/img/icons/svg/save_pack.svg
@ -261,86 +261,90 @@
    </linearGradient>
  </defs>
  <g
-     id="g5122"
-     transform="matrix(1.0695932,0,0,1.0695932,-4.4958872,-4.4788808)">
-    <path
-       style="opacity:0.2"
-       inkscape:connector-curvature="0"
-       id="path39"
-       d="M 64.945916,8.9635502 12.068449,28.523404 c -0.768385,0.284878 -1.280642,1.019287 -1.280642,1.839944 l 0,69.768882 c 0,0.82588 0.517484,1.56552 1.29371,1.84517 l 1.129056,0.40771 52.663155,19.32986 c 0.42601,0.15682 0.89645,0.15943 1.327687,0.008 l 52.354755,-18.40988 c 0.78668,-0.27443 1.30939,-1.01668 1.30939,-1.84779 l 0,-71.898927 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 66.276216,8.9504825 c -0.428623,-0.1489727 -0.901677,-0.1463592 -1.3303,0.013068 z" />
-    <path
-       style="opacity:0.2"
-       inkscape:connector-curvature="0"
-       id="path41"
-       d="M 63.965833,7.9834667 11.088366,27.543321 c -0.768386,0.284877 -1.280643,1.019286 -1.280643,1.839943 l 0,69.76888 c 0,0.825884 0.517484,1.565516 1.29371,1.845166 l 1.129057,0.40772 52.663155,19.32986 c 0.42601,0.15681 0.89645,0.15943 1.327686,0.008 L 118.57609,102.333 c 0.78668,-0.27442 1.30939,-1.01667 1.30939,-1.84778 l 0,-71.898931 c 0,-0.83111 -0.52271,-1.57336 -1.30678,-1.850397 L 65.298746,7.9703989 c -0.431237,-0.1489727 -0.90429,-0.1463591 -1.332913,0.013068 z" />
-    <path
-       style="fill:url(#XMLID_6_)"
-       inkscape:connector-curvature="0"
-       id="path43"
-       d="M 62.497014,7.0033832 9.619547,26.563237 c -0.7683855,0.284878 -1.2806425,1.019287 -1.2806425,1.839944 l 0,69.76888 c 0,0.825883 0.5174841,1.56552 1.2937103,1.845169 l 1.1290562,0.40772 52.663155,19.32986 c 0.428624,0.15681 0.89645,0.15942 1.327687,0.008 l 52.354757,-18.40989 c 0.78668,-0.27443 1.30939,-1.01667 1.30939,-1.847786 l 0,-71.898928 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 63.829928,6.9903154 C 63.396077,6.8413427 62.925637,6.8439562 62.497014,7.0033832 Z" />
-    <polygon
+     id="g4364"
+     transform="matrix(1.0203212,0,0,1.0165106,-0.66569428,-0.66321236)">
+    <g
+       transform="matrix(1.0695932,0,0,1.0695932,-4.4958872,-4.4788808)"
+       id="g5122">
+      <path
+         d="M 64.945916,8.9635502 12.068449,28.523404 c -0.768385,0.284878 -1.280642,1.019287 -1.280642,1.839944 l 0,69.768882 c 0,0.82588 0.517484,1.56552 1.29371,1.84517 l 1.129056,0.40771 52.663155,19.32986 c 0.42601,0.15682 0.89645,0.15943 1.327687,0.008 l 52.354755,-18.40988 c 0.78668,-0.27443 1.30939,-1.01668 1.30939,-1.84779 l 0,-71.898927 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 66.276216,8.9504825 c -0.428623,-0.1489727 -0.901677,-0.1463592 -1.3303,0.013068 z"
+         id="path39"
+         inkscape:connector-curvature="0"
+         style="opacity:0.2" />
+      <path
+         d="M 63.965833,7.9834667 11.088366,27.543321 c -0.768386,0.284877 -1.280643,1.019286 -1.280643,1.839943 l 0,69.76888 c 0,0.825884 0.517484,1.565516 1.29371,1.845166 l 1.129057,0.40772 52.663155,19.32986 c 0.42601,0.15681 0.89645,0.15943 1.327686,0.008 L 118.57609,102.333 c 0.78668,-0.27442 1.30939,-1.01667 1.30939,-1.84778 l 0,-71.898931 c 0,-0.83111 -0.52271,-1.57336 -1.30678,-1.850397 L 65.298746,7.9703989 c -0.431237,-0.1489727 -0.90429,-0.1463591 -1.332913,0.013068 z"
+         id="path41"
+         inkscape:connector-curvature="0"
+         style="opacity:0.2" />
+      <path
+         d="M 62.497014,7.0033832 9.619547,26.563237 c -0.7683855,0.284878 -1.2806425,1.019287 -1.2806425,1.839944 l 0,69.76888 c 0,0.825883 0.5174841,1.56552 1.2937103,1.845169 l 1.1290562,0.40772 52.663155,19.32986 c 0.428624,0.15681 0.89645,0.15942 1.327687,0.008 l 52.354757,-18.40989 c 0.78668,-0.27443 1.30939,-1.01667 1.30939,-1.847786 l 0,-71.898928 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 63.829928,6.9903154 C 63.396077,6.8413427 62.925637,6.8439562 62.497014,7.0033832 Z"
+         id="path43"
+         inkscape:connector-curvature="0"
+         style="fill:url(#XMLID_6_)" />
+      <polygon
+         points="23.989,44.285 23.989,11.065 4.334,11.065 4.334,37.07 4.349,37.07 23.92,44.311 "
+         id="polygon45"
+         style="fill:#febf59"
+         transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)" />
+      <polygon
+         points="43.666,11.065 23.989,11.065 23.989,44.285 23.92,44.311 43.491,37.07 43.666,37.07 "
+         id="polygon47"
+         style="fill:#ffffff"
+         transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)" />
+      <polygon
+         points="23.92,3.82 4.334,11.065 23.92,18.311 43.506,11.065 "
+         id="polygon49"
+         style="fill:#ffffff"
+         transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)" />
+      <path
+         d="m 11.979588,29.57144 m 51.18911,18.937828 -51.18911,-18.937828 0,67.434975 0.0392,0 51.149907,18.919535 0.180335,-0.0653 0,-67.416681 -0.180335,0.06534 z"
+         id="path51"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" />
+      <path
+         d="M 63.168698,10.636226 12.698316,29.307471 c 8.2902,3.065701 16.583014,6.134016 24.875827,9.202331 5.671417,2.098685 11.342833,4.194757 17.01425,6.293443 2.310384,0.854633 6.071291,3.172857 8.580305,3.172857 2.171865,0 5.430969,-2.007211 7.43034,-2.746847 6.055609,-2.239818 12.111219,-4.479635 18.164215,-6.719453 8.292813,-3.065701 16.583017,-6.134016 24.875827,-9.202331 L 63.168698,10.636226 Z"
+         id="path53"
+         inkscape:connector-curvature="0"
+         style="fill:url(#XMLID_7_)" />
+      <path
+         d="m 11.979588,31.21798 0,65.989678 0.0392,0 50.190732,18.587612 C 62.219977,93.909351 62.844617,71.171413 62.031801,49.75332 45.346859,43.577487 28.661917,37.399041 11.979588,31.21798 Z"
+         id="path55"
+         inkscape:connector-curvature="0"
+         style="fill:url(#XMLID_8_)" />
+      <path
+         d="m 64.530361,116.12719 49.790859,-18.355003 0.45476,0 0,-65.835479 C 109.00786,33.943919 65.842366,49.00323 64.864896,50.346598 63.840382,51.747464 64.498998,113.315 64.530361,116.12719 Z"
+         id="path57"
+         inkscape:connector-curvature="0"
+         style="fill:url(#XMLID_9_)" />
+      <path
+         d="m 63.469257,29.354515 50.350163,-0.120224 -50.595837,-3.063087 0,-15.804174 c 0,0 -2.041188,14.973063 -2.57174,15.681336 -0.530552,0.708274 -48.392604,3.306149 -48.392604,3.306149 l 48.269767,-0.734409 2.451516,19.478833 0.488735,-18.744424 z"
+         id="path59"
+         inkscape:connector-curvature="0"
+         style="fill:url(#XMLID_10_)" />
+    </g>
+    <polyline
       transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
-       style="fill:#febf59"
-       id="polygon45"
-       points="23.989,11.065 4.334,11.065 4.334,37.07 4.349,37.07 23.92,44.311 23.989,44.285 " />
-    <polygon
-       transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
-       style="fill:#ffffff"
-       id="polygon47"
-       points="23.989,11.065 23.989,44.285 23.92,44.311 43.491,37.07 43.666,37.07 43.666,11.065 " />
-    <polygon
-       transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
-       style="fill:#ffffff"
-       id="polygon49"
-       points="43.506,11.065 23.92,3.82 4.334,11.065 23.92,18.311 " />
-    <path
-       style="fill:#ffffff"
-       inkscape:connector-curvature="0"
-       id="path51"
-       d="m 11.979588,29.57144 m 51.18911,18.937828 -51.18911,-18.937828 0,67.434975 0.0392,0 51.149907,18.919535 0.180335,-0.0653 0,-67.416681 -0.180335,0.06534 z" />
-    <path
-       style="fill:url(#XMLID_7_)"
-       inkscape:connector-curvature="0"
-       id="path53"
-       d="M 63.168698,10.636226 12.698316,29.307471 c 8.2902,3.065701 16.583014,6.134016 24.875827,9.202331 5.671417,2.098685 11.342833,4.194757 17.01425,6.293443 2.310384,0.854633 6.071291,3.172857 8.580305,3.172857 2.171865,0 5.430969,-2.007211 7.43034,-2.746847 6.055609,-2.239818 12.111219,-4.479635 18.164215,-6.719453 8.292813,-3.065701 16.583017,-6.134016 24.875827,-9.202331 L 63.168698,10.636226 Z" />
-    <path
-       style="fill:url(#XMLID_8_)"
-       inkscape:connector-curvature="0"
-       id="path55"
-       d="m 11.979588,31.21798 0,65.989678 0.0392,0 50.190732,18.587612 C 62.219977,93.909351 62.844617,71.171413 62.031801,49.75332 45.346859,43.577487 28.661917,37.399041 11.979588,31.21798 Z" />
-    <path
-       style="fill:url(#XMLID_9_)"
-       inkscape:connector-curvature="0"
-       id="path57"
-       d="m 64.530361,116.12719 49.790859,-18.355003 0.45476,0 0,-65.835479 C 109.00786,33.943919 65.842366,49.00323 64.864896,50.346598 63.840382,51.747464 64.498998,113.315 64.530361,116.12719 Z" />
-    <path
-       style="fill:url(#XMLID_10_)"
-       inkscape:connector-curvature="0"
-       id="path59"
-       d="m 63.469257,29.354515 50.350163,-0.120224 -50.595837,-3.063087 0,-15.804174 c 0,0 -2.041188,14.973063 -2.57174,15.681336 -0.530552,0.708274 -48.392604,3.306149 -48.392604,3.306149 l 48.269767,-0.734409 2.451516,19.478833 0.488735,-18.744424 z" />
-  </g>
-  <polyline
-     points="0 48 0 0 48 0 48 48"
-     id="polyline61"
-     style="fill:none"
-     transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)" />
-  <g
-     id="g5105"
-     transform="matrix(0.64877838,0,0,0.64877838,104.9525,50.991411)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path9"
-       d="m -50.298565,66.300743 c -0.646309,-1.892353 -2.338116,-3.155505 -4.239023,-3.155505 l -15.844061,0 0,-39.867725 c 0,-5.870002 -4.495645,-10.628923 -10.043443,-10.628923 l -52.105768,0 c -5.54779,0 -10.04439,4.758731 -10.04439,10.628923 l 0,39.867725 -12.69046,0 c -1.90119,0 -3.59784,1.263152 -4.23921,3.155505 -0.64136,1.894254 -0.09,4.010915 1.37835,5.286423 l 50.36263,43.828264 c 1.66235,1.44469 4.05939,1.44469 5.72173,0 l 50.365487,-43.828264 c 1.463699,-1.277409 2.014962,-3.392169 1.378158,-5.286423 z"
-       style="fill:url(#XMLID_4_)" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path26"
-       d="m -74.882997,67.908911 0,-44.631398 c 0,-3.234394 -2.487337,-5.865249 -5.542095,-5.865249 l -52.105768,0 c -3.05666,0 -5.54209,2.630855 -5.54209,5.865249 l 0,44.631398 -17.19276,0 50.36264,43.828269 50.365482,-43.828269 -20.345409,0 z"
-       style="fill:url(#XMLID_5_)" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path33"
-       d="m -116.86928,62.057919 c 13.68558,-7.20919 26.013911,-15.217712 40.277368,-17.873279 l 0,-21.54203 c 0,-1.887601 -1.719371,-3.423534 -3.83318,-3.423534 l -52.105768,0 c -2.11381,0 -3.83318,1.535933 -3.83318,3.423534 l 0,38.927726 c 6.29676,2.877974 13.13812,3.724828 19.49476,0.487583 z"
-       style="fill:url(#XMLID_6_-3)" />
+       style="fill:none"
+       id="polyline61"
+       points="0 48 0 0 48 0 48 48" />
+    <g
+       transform="matrix(0.64877838,0,0,0.64877838,104.9525,50.991411)"
+       id="g5105">
+      <path
+         style="fill:url(#XMLID_4_)"
+         d="m -50.298565,66.300743 c -0.646309,-1.892353 -2.338116,-3.155505 -4.239023,-3.155505 l -15.844061,0 0,-39.867725 c 0,-5.870002 -4.495645,-10.628923 -10.043443,-10.628923 l -52.105768,0 c -5.54779,0 -10.04439,4.758731 -10.04439,10.628923 l 0,39.867725 -12.69046,0 c -1.90119,0 -3.59784,1.263152 -4.23921,3.155505 -0.64136,1.894254 -0.09,4.010915 1.37835,5.286423 l 50.36263,43.828264 c 1.66235,1.44469 4.05939,1.44469 5.72173,0 l 50.365487,-43.828264 c 1.463699,-1.277409 2.014962,-3.392169 1.378158,-5.286423 z"
+         id="path9"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#XMLID_5_)"
+         d="m -74.882997,67.908911 0,-44.631398 c 0,-3.234394 -2.487337,-5.865249 -5.542095,-5.865249 l -52.105768,0 c -3.05666,0 -5.54209,2.630855 -5.54209,5.865249 l 0,44.631398 -17.19276,0 50.36264,43.828269 50.365482,-43.828269 -20.345409,0 z"
+         id="path26"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#XMLID_6_-3)"
+         d="m -116.86928,62.057919 c 13.68558,-7.20919 26.013911,-15.217712 40.277368,-17.873279 l 0,-21.54203 c 0,-1.887601 -1.719371,-3.423534 -3.83318,-3.423534 l -52.105768,0 c -2.11381,0 -3.83318,1.535933 -3.83318,3.423534 l 0,38.927726 c 6.29676,2.877974 13.13812,3.724828 19.49476,0.487583 z"
+         id="path33"
+         inkscape:connector-curvature="0" />
+    </g>
  </g>
 </svg>
--- a/main/work/work_list_all.php
+++ b/main/work/work_list_all.php
@ -204,8 +204,8 @@ if (!empty($work_data['enable_qualification']) &&

    $columns = array(
        //get_lang('Type'),
-        get_lang('FirstName'),
-        get_lang('LastName'),
+        get_lang('FullUserName'),
+        //get_lang('LastName'),
        get_lang('Title'),
        get_lang('Feedback'),
        get_lang('Date'),
@ -224,23 +224,23 @@ if (!empty($work_data['enable_qualification']) &&
            'sortable' => 'false',
        ),*/
        array(
-            'name' => 'firstname',
-            'index' => 'firstname',
-            'width' => '35',
+            'name' => 'fullname',
+            'index' => 'fullname',
+            'width' => '30',
            'align' => 'left',
            'search' => 'true',
        ),
-        array(
+        /*array(
            'name' => 'lastname',
            'index' => 'lastname',
            'width' => '35',
            'align' => 'left',
            'search' => 'true',
-        ),
+        ),*/
        array(
            'name' => 'title',
            'index' => 'title',
-            'width' => '40',
+            'width' => '25',
            'align' => 'left',
            'search' => 'false',
            'wrap_cell' => 'true',
@ -248,14 +248,14 @@ if (!empty($work_data['enable_qualification']) &&
        array(
            'name' => 'qualification',
            'index' => 'qualification',
-            'width' => '20',
-            'align' => 'left',
+            'width' => '15',
+            'align' => 'center',
            'search' => 'true',
        ),
        array(
            'name' => 'sent_date',
            'index' => 'sent_date',
-            'width' => '40',
+            'width' => '25',
            'align' => 'left',
            'search' => 'true',
            'wrap_cell' => 'true',
@ -263,7 +263,7 @@ if (!empty($work_data['enable_qualification']) &&
        array(
            'name' => 'qualificator_id',
            'index' => 'qualificator_id',
-            'width' => '25',
+            'width' => '20',
            'align' => 'left',
            'search' => 'true',
        ),
@ -278,7 +278,7 @@ if (!empty($work_data['enable_qualification']) &&
        array(
            'name' => 'actions',
            'index' => 'actions',
-            'width' => '30',
+            'width' => '25',
            'align' => 'left',
            'search' => 'false',
            'sortable' => 'false',