merge

main/inc/lib/display.lib.php

@@ -232,8 +232,8 @@ class Display
                 foreach ($header as $index => $header_item) {
                     $table->set_header(
                         $index,
-                        $header_item[0],
-                        $header_item[1],
+                        isset($header_item[0]) ? $header_item[0] : null,
+                        isset($header_item[1]) ? $header_item[1] : null,
                         isset($header_item[2]) ? $header_item[2] : null,
                         isset($header_item[3]) ? $header_item[3] : null
                     );

main/social/profile.php

@@ -411,7 +411,11 @@ if ($show_full_profile) {
                         break;
                     default:
                         if (!empty($data)) {
-                            $extra_information_value .= '<li class="list-group-item"><strong>'.ucfirst($extraFieldInfo['display_text']).':</strong> '.$data.'</li>';
+                            $extra_field_title = ucfirst($extraFieldInfo['display_text']);
+                            if ($extra_field_title == 'Skype') {
+                                $data = '<a href="skype:' . $data . '?chat">' . get_lang('Chat') . '</a>';
+                            }
+                            $extra_information_value .= '<li class="list-group-item">'.Display::return_icon('skype.png', $extraFieldInfo['display_text'], null, ICON_SIZE_TINY, false) . ' ' . $data.'</li>';
                         }
                     break;
                 }

main/template/default/skill/list.tpl

@@ -14,10 +14,10 @@
         </thead>
         <tfoot>
             <tr>
-                <th width="200">{{ "Name" | get_lang }}</th>
-                <th class="text-center">{{ "ShortName" | get_lang }}</th>
-                <th width="300">{{ "Description" | get_lang }}</th>
-                <th class="text-right">{{ "Options" | get_lang }}</th>
+                <th>{{ "Name" | get_lang }}</th>
+                <th>{{ "ShortCode" | get_lang }}</th>
+                <th>{{ "Description" | get_lang }}</th>
+                <th>{{ "Options" | get_lang }}</th>
             </tr>
         </tfoot>
         <tbody>