From adc70103e0c5f33f34d1cb42c8d06662def37362 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Wed, 25 May 2016 07:32:23 +0000 Subject: [PATCH] Customer portal : UI improvements SVN:trunk[4133] --- css/font-combodo/combodo-webfont.woff | Bin 4312 -> 5100 bytes css/font-combodo/combodo-webfont.woff2 | Bin 3588 -> 4308 bytes css/font-combodo/combodo.sfd | 517 +++++++++++------- css/font-combodo/combodo.ttf | Bin 3588 -> 4248 bytes css/font-combodo/exclude.txt | 2 +- css/font-combodo/font-combodo.css | 151 ++++- css/font-combodo/glyphs/4.svg | 20 + css/font-combodo/glyphs/D.svg | 23 + css/font-combodo/test.html | 81 +++ .../helpers/applicationhelper.class.inc.php | 10 +- .../bricks/user-profile/layout.html.twig | 6 +- .../portal/src/views/layout.html.twig | 19 +- .../portal/web/css/portal.css | 294 ++++++---- .../itop-tickets/datamodel.itop-tickets.xml | 2 +- 14 files changed, 817 insertions(+), 308 deletions(-) create mode 100644 css/font-combodo/glyphs/4.svg create mode 100644 css/font-combodo/glyphs/D.svg create mode 100644 css/font-combodo/test.html diff --git a/css/font-combodo/combodo-webfont.woff b/css/font-combodo/combodo-webfont.woff index fb275baa55c33c411c8fb6befae1e9cae6c1a42d..408495bcb2dffc8709741ae169761d81e74a79e6 100644 GIT binary patch delta 4631 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 Cnl3#6 literal 3588 zcmV+f4*T(UPew8T0RR9101gBI5dZ)H02e#}01ci10RR9100000000000000000000 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 Kl@kX60000rzU>nL diff --git a/css/font-combodo/combodo.sfd b/css/font-combodo/combodo.sfd index 938e533c0..77b9930f5 100644 --- a/css/font-combodo/combodo.sfd +++ b/css/font-combodo/combodo.sfd @@ -5,7 +5,7 @@ FamilyName: Combodo Weight: Regular Copyright: Copyright (c) 2016, Combodo UComments: "2016-5-20: Created with FontForge (http://fontforge.org)" -Version: 001.000 +Version: 001.100 ItalicAngle: 0 UnderlinePosition: -102 UnderlineWidth: 51 @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1463745065 -ModificationTime: 1464086488 +ModificationTime: 1464103566 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -48,7 +48,7 @@ FitToEm: 0 WinInfo: 0 31 10 BeginPrivate: 0 EndPrivate -BeginChars: 256 6 +BeginChars: 256 8 StartChar: zero Encoding: 48 48 0 @@ -263,194 +263,194 @@ Flags: HW LayerCount: 3 Fore SplineSet -641 -116 m 0x9b20 - 637 -116 633 -115 630 -113 c 0 - 623 -109 611 -99 618 -75 c 0 - 621 -65 626 -52 632 -40 c 0 - 640 -23 648 -4 651 13 c 0 - 653 26 643 50 624 75 c 0 - 609 94 595 108 586 115 c 1 - 562 107 523 97 500 97 c 2 - 499 97 l 2xdb20 - 479 97 468 105 460 111 c 0 - 457 114 455 115 453 116 c 0 - 450 116 438 112 423 104 c 0 - 412 98 405 94 401 90 c 1 - 411 80 436 61 448 52 c 0 - 460 43 468 37 473 32 c 0 - 491 15 488 -28 487 -36 c 0 - 485 -55 477 -90 452 -105 c 0 - 444 -110 435 -112 426 -112 c 0 - 388 -112 356 -68 351 -51 c 0 - 347 -39 346 -18 345 -6 c 1 - 338 0 325 9 313 21 c 0 - 283 49 271 70 272 87 c 0 - 274 119 301 173 354 215 c 0 - 367 225 387 232 404 236 c 1 - 397 242 388 247 377 249 c 0 - 375 249 373 250 372 250 c 0 - 366 250 361 247 356 244 c 0 - 354 243 352 241 350 240 c 0 - 321 226 296 206 277 189 c 0 - 260 174 248 164 236 161 c 0 - 234 161 232 161 230 161 c 0 - 221 161 206 165 168 192 c 0 - 159 198 151 204 145 209 c 1 - 127 190 l 1 - 126 189 l 2 - 123 187 109 178 93 178 c 0 - 79 178 67 185 61 198 c 0 - 50 221 53 284 53 296 c 2 - 53 298 l 1 - 54 299 l 2 - 55 305 61 333 82 345 c 0 - 86 347 89 348 94 348 c 0 - 104 348 120 344 172 314 c 0 - 189 304 205 294 215 288 c 1 - 309 342 l 1 - 312 366 l 1 - 304 373 290 386 276 400 c 0 - 244 432 226 456 221 475 c 0 - 214 502 218 538 231 575 c 0 - 237 593 255 636 284 651 c 0 - 293 656 305 658 320 658 c 0xb9a0 - 342 658 367 653 389 644 c 0 - 416 633 437 617 452 597 c 0 - 479 562 478 509 475 479 c 1 - 482 479 l 1 - 505 499 l 1 - 543 519 l 1 - 538 529 l 1 - 495 537 l 1 - 492 547 l 2 - 492 548 483 571 477 598 c 0 - 471 625 466 664 490 680 c 0 - 498 685 508 687 520 687 c 0 - 554 687 597 666 602 664 c 2 - 607 661 l 1 - 644 593 l 2 - 649 589 659 581 669 571 c 0 - 691 549 700 531 696 515 c 0 - 692 499 674 481 643 452 c 0 - 623 433 601 412 593 399 c 0 - 584 382 601 365 614 355 c 1 - 625 367 641 385 651 397 c 0 - 661 409 680 426 700 441 c 0 - 727 461 749 472 765 473 c 0 - 766 473 767 473 768 473 c 0 - 787 473 808 460 831 446 c 0 - 845 437 865 424 873 424 c 0 - 874 424 l 2x9d60 - 875 424 880 425 884 426 c 0 - 897 429 915 433 930 433 c 0 - 956 433 965 421 969 412 c 0 - 976 395 967 367 959 347 c 0 - 954 334 939 303 921 292 c 0 - 916 289 911 288 905 288 c 0 - 888 288 863 299 835 311 c 0 - 810 322 780 335 766 335 c 0 - 765 335 764 335 764 335 c 0 - 763 335 757 331 748 315 c 0 - 741 301 734 283 727 264 c 0 - 721 248 715 231 708 216 c 1 - 744 178 763 108 753 47 c 0 - 748 19 727 -22 708 -51 c 0 - 697 -68 687 -82 677 -93 c 0 - 663 -109 652 -116 641 -116 c 0x9b20 -308 85 m 1 - 308 83 312 72 340 46 c 0 - 357 30 374 18 374 18 c 2 - 380 13 l 1 - 381 4 l 2 - 382 -9 383 -32 386 -40 c 0 - 387 -42 393 -53 402 -62 c 0 - 411 -71 419 -76 426 -76 c 0 - 429 -76 430 -75 433 -73 c 0 - 439 -69 445 -60 448 -46 c 0 - 454 -22 450 1 447 6 c 0 - 443 9 435 17 426 23 c 0 - 379 58 358 75 362 95 c 0 - 363 100 366 113 402 134 c 0 - 410 138 435 153 453 153 c 0xb9a0 - 455 153 458 152 460 152 c 0 - 470 150 476 145 482 141 c 0 - 488 136 491 133 499 133 c 2 - 500 133 l 2xd920 - 521 133 562 145 581 153 c 2 - 589 156 l 1 - 596 153 l 2xb920 - 612 146 637 119 654 97 c 0 - 672 73 693 37 688 7 c 0 - 686 -7 681 -21 675 -35 c 1 - 677 -32 679 -28 681 -25 c 0 - 700 6 713 36 716 53 c 0 - 720 79 719 109 711 136 c 0 - 703 163 690 185 674 198 c 2 - 663 207 l 1 - 670 221 l 2 - 678 237 686 257 693 277 c 0 - 710 322 724 361 753 370 c 0 - 757 371 761 372 766 372 c 0 - 788 372 818 359 850 345 c 0 - 868 337 893 326 903 325 c 1 - 907 329 916 340 924 359 c 0 - 932 377 934 390 934 396 c 0 - 933 396 932 396 930 396 c 0xdb20 - 919 396 902 392 892 390 c 0 - 886 389 881 388 878 388 c 0 - 876 388 875 387 873 387 c 0 - 855 387 833 400 811 414 c 0 - 797 423 776 437 768 437 c 0 - 762 436 745 429 722 412 c 0 - 703 398 687 381 680 373 c 0 - 664 353 631 319 630 318 c 2 - 620 307 l 1 - 607 314 l 2 - 606 314 589 325 574 341 c 0 - 552 366 547 393 561 417 c 0 - 571 435 595 458 618 479 c 0 - 633 493 656 515 660 523 c 0 - 659 525 656 533 640 548 c 0 - 629 559 619 566 619 566 c 2 - 615 569 l 1 - 580 633 l 1 - 566 639 539 650 520 650 c 0x9d60 - 514 650 512 650 511 649 c 0 - 509 646 507 633 514 602 c 0 - 517 589 520 577 523 569 c 1 - 562 561 l 1 - 593 505 l 1 - 526 468 l 1 - 495 442 l 1 - 431 443 l 1 - 435 465 l 2 - 439 485 446 544 423 575 c 0 - 400 605 354 621 320 621 c 0x99a0 - 310 621 304 619 301 618 c 0 - 278 606 246 528 257 484 c 0 - 262 463 311 415 344 388 c 2 - 352 381 l 1 - 342 318 l 1 - 214 245 l 1 - 205 251 l 2 - 205 251 181 266 155 281 c 0 - 119 302 104 308 98 310 c 1 - 95 306 91 298 90 293 c 0 - 89 264 90 227 94 215 c 0 - 97 216 100 217 103 219 c 2 - 142 260 l 1 - 155 249 l 2 - 185 224 218 201 229 198 c 0 - 234 201 245 210 253 217 c 0 - 273 234 300 258 334 274 c 0 - 335 274 336 275 338 276 c 0 - 345 280 356 287 372 287 c 0 - 376 287 380 286 384 285 c 0 - 431 276 455 235 456 233 c 2 - 469 209 l 1 - 442 206 l 2 - 424 204 390 196 377 186 c 0 - 330 149 310 105 308 85 c 1 +641 -116 m 4x9b20 + 637 -116 633 -115 630 -113 c 4 + 623 -109 611 -99 618 -75 c 4 + 621 -65 626 -52 632 -40 c 4 + 640 -23 648 -4 651 13 c 4 + 653 26 643 50 624 75 c 4 + 609 94 595 108 586 115 c 5 + 562 107 523 97 500 97 c 6 + 499 97 l 6xdb20 + 479 97 468 105 460 111 c 4 + 457 114 455 115 453 116 c 4 + 450 116 438 112 423 104 c 4 + 412 98 405 94 401 90 c 5 + 411 80 436 61 448 52 c 4 + 460 43 468 37 473 32 c 4 + 491 15 488 -28 487 -36 c 4 + 485 -55 477 -90 452 -105 c 4 + 444 -110 435 -112 426 -112 c 4 + 388 -112 356 -68 351 -51 c 4 + 347 -39 346 -18 345 -6 c 5 + 338 0 325 9 313 21 c 4 + 283 49 271 70 272 87 c 4 + 274 119 301 173 354 215 c 4 + 367 225 387 232 404 236 c 5 + 397 242 388 247 377 249 c 4 + 375 249 373 250 372 250 c 4 + 366 250 361 247 356 244 c 4 + 354 243 352 241 350 240 c 4 + 321 226 296 206 277 189 c 4 + 260 174 248 164 236 161 c 4 + 234 161 232 161 230 161 c 4 + 221 161 206 165 168 192 c 4 + 159 198 151 204 145 209 c 5 + 127 190 l 5 + 126 189 l 6 + 123 187 109 178 93 178 c 4 + 79 178 67 185 61 198 c 4 + 50 221 53 284 53 296 c 6 + 53 298 l 5 + 54 299 l 6 + 55 305 61 333 82 345 c 4 + 86 347 89 348 94 348 c 4 + 104 348 120 344 172 314 c 4 + 189 304 205 294 215 288 c 5 + 309 342 l 5 + 312 366 l 5 + 304 373 290 386 276 400 c 4 + 244 432 226 456 221 475 c 4 + 214 502 218 538 231 575 c 4 + 237 593 255 636 284 651 c 4 + 293 656 305 658 320 658 c 4xb9a0 + 342 658 367 653 389 644 c 4 + 416 633 437 617 452 597 c 4 + 479 562 478 509 475 479 c 5 + 482 479 l 5 + 505 499 l 5 + 543 519 l 5 + 538 529 l 5 + 495 537 l 5 + 492 547 l 6 + 492 548 483 571 477 598 c 4 + 471 625 466 664 490 680 c 4 + 498 685 508 687 520 687 c 4 + 554 687 597 666 602 664 c 6 + 607 661 l 5 + 644 593 l 6 + 649 589 659 581 669 571 c 4 + 691 549 700 531 696 515 c 4 + 692 499 674 481 643 452 c 4 + 623 433 601 412 593 399 c 4 + 584 382 601 365 614 355 c 5 + 625 367 641 385 651 397 c 4 + 661 409 680 426 700 441 c 4 + 727 461 749 472 765 473 c 4 + 766 473 767 473 768 473 c 4 + 787 473 808 460 831 446 c 4 + 845 437 865 424 873 424 c 4 + 874 424 l 6x9d60 + 875 424 880 425 884 426 c 4 + 897 429 915 433 930 433 c 4 + 956 433 965 421 969 412 c 4 + 976 395 967 367 959 347 c 4 + 954 334 939 303 921 292 c 4 + 916 289 911 288 905 288 c 4 + 888 288 863 299 835 311 c 4 + 810 322 780 335 766 335 c 4 + 765 335 764 335 764 335 c 4 + 763 335 757 331 748 315 c 4 + 741 301 734 283 727 264 c 4 + 721 248 715 231 708 216 c 5 + 744 178 763 108 753 47 c 4 + 748 19 727 -22 708 -51 c 4 + 697 -68 687 -82 677 -93 c 4 + 663 -109 652 -116 641 -116 c 4x9b20 +308 85 m 5 + 308 83 312 72 340 46 c 4 + 357 30 374 18 374 18 c 6 + 380 13 l 5 + 381 4 l 6 + 382 -9 383 -32 386 -40 c 4 + 387 -42 393 -53 402 -62 c 4 + 411 -71 419 -76 426 -76 c 4 + 429 -76 430 -75 433 -73 c 4 + 439 -69 445 -60 448 -46 c 4 + 454 -22 450 1 447 6 c 4 + 443 9 435 17 426 23 c 4 + 379 58 358 75 362 95 c 4 + 363 100 366 113 402 134 c 4 + 410 138 435 153 453 153 c 4xb9a0 + 455 153 458 152 460 152 c 4 + 470 150 476 145 482 141 c 4 + 488 136 491 133 499 133 c 6 + 500 133 l 6xd920 + 521 133 562 145 581 153 c 6 + 589 156 l 5 + 596 153 l 6xb920 + 612 146 637 119 654 97 c 4 + 672 73 693 37 688 7 c 4 + 686 -7 681 -21 675 -35 c 5 + 677 -32 679 -28 681 -25 c 4 + 700 6 713 36 716 53 c 4 + 720 79 719 109 711 136 c 4 + 703 163 690 185 674 198 c 6 + 663 207 l 5 + 670 221 l 6 + 678 237 686 257 693 277 c 4 + 710 322 724 361 753 370 c 4 + 757 371 761 372 766 372 c 4 + 788 372 818 359 850 345 c 4 + 868 337 893 326 903 325 c 5 + 907 329 916 340 924 359 c 4 + 932 377 934 390 934 396 c 4 + 933 396 932 396 930 396 c 4xdb20 + 919 396 902 392 892 390 c 4 + 886 389 881 388 878 388 c 4 + 876 388 875 387 873 387 c 4 + 855 387 833 400 811 414 c 4 + 797 423 776 437 768 437 c 4 + 762 436 745 429 722 412 c 4 + 703 398 687 381 680 373 c 4 + 664 353 631 319 630 318 c 6 + 620 307 l 5 + 607 314 l 6 + 606 314 589 325 574 341 c 4 + 552 366 547 393 561 417 c 4 + 571 435 595 458 618 479 c 4 + 633 493 656 515 660 523 c 4 + 659 525 656 533 640 548 c 4 + 629 559 619 566 619 566 c 6 + 615 569 l 5 + 580 633 l 5 + 566 639 539 650 520 650 c 4x9d60 + 514 650 512 650 511 649 c 4 + 509 646 507 633 514 602 c 4 + 517 589 520 577 523 569 c 5 + 562 561 l 5 + 593 505 l 5 + 526 468 l 5 + 495 442 l 5 + 431 443 l 5 + 435 465 l 6 + 439 485 446 544 423 575 c 4 + 400 605 354 621 320 621 c 4x99a0 + 310 621 304 619 301 618 c 4 + 278 606 246 528 257 484 c 4 + 262 463 311 415 344 388 c 6 + 352 381 l 5 + 342 318 l 5 + 214 245 l 5 + 205 251 l 6 + 205 251 181 266 155 281 c 4 + 119 302 104 308 98 310 c 5 + 95 306 91 298 90 293 c 4 + 89 264 90 227 94 215 c 4 + 97 216 100 217 103 219 c 6 + 142 260 l 5 + 155 249 l 6 + 185 224 218 201 229 198 c 4 + 234 201 245 210 253 217 c 4 + 273 234 300 258 334 274 c 4 + 335 274 336 275 338 276 c 4 + 345 280 356 287 372 287 c 4 + 376 287 380 286 384 285 c 4 + 431 276 455 235 456 233 c 6 + 469 209 l 5 + 442 206 l 6 + 424 204 390 196 377 186 c 4 + 330 149 310 105 308 85 c 5 EndSplineSet EndChar @@ -558,5 +558,140 @@ SplineSet 512 443 l 1 EndSplineSet EndChar + +StartChar: four +Encoding: 52 52 6 +Width: 1024 +VWidth: 0 +Flags: H +LayerCount: 3 +Fore +SplineSet +801 -67 m 1 + 643 19 l 1 + 601 9 557 -2 513 -2 c 0 + 407 -2 307 33 233 97 c 0 + 197 128 168 165 148 206 c 0 + 127 248 117 293 117 339 c 0 + 117 385 127 431 148 473 c 0 + 168 514 197 550 233 581 c 0 + 307 645 407 680 513 680 c 0 + 564 680 614 672 662 654 c 0 + 709 637 751 612 788 581 c 0 + 825 550 855 513 876 473 c 0 + 898 430 909 385 909 339 c 0 + 909 288 892 238 861 189 c 0 + 835 149 801 111 757 77 c 1 + 801 -67 l 1 + 801 -67 l 1 +649 63 m 1 + 733 17 l 1 + 710 93 l 1 + 721 102 l 2 + 816 173 868 256 868 339 c 0 + 868 502 705 639 513 639 c 0 + 317 639 158 504 158 339 c 0 + 158 174 317 39 513 39 c 0 + 552 39 592 49 634 59 c 2 + 649 63 l 1 + 649 63 l 1 +675 306 m 1 + 675 298 667 292 657 292 c 2 + 550 292 l 1 + 550 185 l 2 + 550 175 543 167 535 167 c 2 + 456 167 l 2 + 448 167 441 175 441 185 c 2 + 441 292 l 1 + 334 292 l 2 + 324 292 316 298 316 306 c 2 + 316 386 l 2 + 316 394 324 401 334 401 c 2 + 441 401 l 1 + 441 508 l 2 + 441 518 448 525 456 525 c 2 + 535 525 l 2 + 543 525 550 518 550 508 c 2 + 550 401 l 1 + 657 401 l 2 + 667 401 675 394 675 386 c 2 + 675 306 l 1 + 675 306 l 1 +EndSplineSet +EndChar + +StartChar: D +Encoding: 68 68 7 +Width: 1080 +VWidth: 0 +Flags: HW +LayerCount: 3 +Fore +SplineSet +468.64572731 -13.558737032 m 0 + 468.64572731 -44.7954148575 458.407451046 -89.0800233035 424.775770836 -89.0800233035 c 0 + 397.022747309 -89.0800233035 372.32180565 -52.6263197761 369 -41 c 0 + 365 -27 363 7 363 7 c 1 + 363 7 291.959642075 62.4698685172 291.959642075 87.9691750735 c 0 + 291.959642075 113.376863783 316.679015082 163.529631764 366 202 c 0 + 388 219 439 225 439 225 c 1 + 439 225 414.110137344 268.926791176 372.740852657 268.926791176 c 0 + 359.228703245 268.926791176 349.708131846 261.354065923 343 258 c 0 + 289 232 252 185 234 181 c 0 + 233.433333333 180.866666667 232.807777778 180.802222222 232.127888889 180.802222222 c 0 + 212.411111111 180.802222222 147 235 147 235 c 1 + 119 206 l 1 + 119 206 107.410225922 197.844233056 96.8861781951 197.844233056 c 0 + 72.8428111824 197.844233056 75.8106508876 252.834903882 75.8106508876 279.065543924 c 0 + 75.8106508876 288.562130178 76 295 76 295 c 2 + 76 295 82 320 96 328 c 0 + 96.7777777778 328.444444444 97.8425925926 328.654320988 99.1601508916 328.654320988 c 0 + 121.558641975 328.654320988 217 268 217 268 c 2 + 327 330 l 1 + 333 372 l 1 + 333 372 250 441 241 477 c 0 + 239.237084845 484.198570214 238.423796587 492.217272748 238.423796587 500.713675674 c 0 + 238.423796587 550.051499679 265.848016675 615.497463136 294 630 c 0 + 300.138285885 633.19190866 309.652570174 634.876675176 321.06264977 634.876675176 c 0 + 356.123522363 634.876675176 409.08466311 618.968959665 437 582 c 0 + 453.253731343 560.328358209 457.37781243 530.165961239 457.37781243 505.134225287 c 0 + 457.37781243 479.343951882 453 459 453 459 c 1 + 488 459 l 1 + 514 481 l 1 + 566 509 l 1 + 548 542 l 1 + 507 550 l 1 + 507 550 489.207333635 598.144861928 489.207333635 631.213835085 c 0 + 489.207333635 653.370834845 497.209328773 663.76 518.552 663.76 c 0 + 548.76 663.76 591 642 591 642 c 1 + 627 577 l 1 + 627 577 674.338776197 541.495917852 674.338776197 519.129431851 c 0 + 674.338776197 494.680774842 591.858662315 438.748733005 574 407 c 0 + 570.44966443 400.67114094 568.948515833 394.461420657 568.948515833 388.484860559 c 0 + 568.948515833 355.743705239 614 330 614 330 c 1 + 614 330 646 364 662 384 c 0 + 677.698951456 403.623689319 733.747750392 453.052350823 762.50041559 453.052350823 c 0 + 789.718129014 453.052350823 840.744832641 403.683896618 866.626933224 403.683896618 c 0 + 877.665037682 403.683896618 901.761638559 412.671089779 923.596296639 412.671089779 c 0 + 937.424421815 412.671089779 945.131722305 409.276302365 945.131722305 396.117809414 c 0 + 945.131722305 371.07574487 921.900878422 317.674239003 905 307 c 0 + 903.42865268 306.007570114 901.296449801 305.555476681 898.689371742 305.555476681 c 0 + 871.975805728 305.555476681 795.404207421 353.021610762 761.47268426 353.021610762 c 0 + 758.674526974 353.021610762 756.166341309 352.698819777 754 352 c 0 + 723 342 708 263 682 213 c 1 + 713.440186944 187.351426441 732.558534282 135.005533735 732.558534282 84.8474797418 c 0 + 732.558534282 74.3822920494 731.726266594 64.0123462436 730 54 c 0 + 722.320058737 8.88034508281 658.423377389 -91.5344640176 638.282830107 -91.5344640176 c 0 + 633.665749707 -91.5344640176 631.828849883 -86.9206443165 631.828849883 -82.6811859806 c 0 + 631.828849883 -63.99641099 660.208602509 -21.5757274442 666 14 c 0 + 666.344981129 16.1191697915 666.510229881 18.3087752442 666.510229881 20.5578040153 c 0 + 666.510229881 63.9437392488 605.014339632 129.443547166 586 138 c 1 + 565 130 522 118 499 118 c 0 + 474.770142654 118 470.175238349 137.203046458 452.692311762 137.203046458 c 0 + 436.234303616 137.203046458 379.90506877 108.265081487 379.90506877 93.00730293 c 0 + 379.90506877 77.1876677059 446.297232175 35.7239986947 460 23 c 0 + 465.46621004 17.924233534 468.64572731 3.39680361548 468.64572731 -13.558737032 c 0 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/css/font-combodo/combodo.ttf b/css/font-combodo/combodo.ttf index d504fd97bbe030f7d78fac303e6e81955fbc3566..8049b8f2b150145a67d14d408eb4462943c23fbf 100644 GIT binary patch delta 1150 zcmYLJO-vkR7=FL`=68pg{hQeV_J3yCEzq*V{-VGx6c(t^f-N>QX)K$Cg7UWlHDH>o z2M=C|nz>XDMibL0CoC6ZVxlHSJ=8QI_11e2o{WvA(X8*T2WRqSzUO_u_kHJiGVi<- zx)*N%0RR==1`5klQ;U}mpU?ja;JJ&@(DYP8LmAGog8-rSFY$-E0dXOL&ts(bZj6Dxyf39-1gd3gI_YB7lX3V`dY_0?))Mf$z( z6v^Lk71l8#jL~B(mOz|X-`YR0USPgJ{1f8yn>)3tcr5>o1?CWUZdDKJutbiKZ#9f< zSGQJQ9s05RVWPEbo;81He&-A@lL4Vs z>;FrXT6>rC0dwMf!br|I^^4>=eae2z-8@~QJ+wjLPV*aj#C#4x=!aPVF2!4BDw#^= zbHzfjkj)r@)~#y-?{@r1ogN*pyfimvs{?b=cH^xFCx4x2f2w#8Gt>o4^?I=eYCXNn zKcNi*v(3-w1Lhulii$K;luVNWCZ8)5OQeiD%TyUbC4$*z1UxXnjv$}^PjZ>G4QPY5 zc+{RPlQcnBP*{|SFsNJLbuADjt(q9jX3(s5)M}V$k$@c{Xb-lrOl;gTuH`LKm=_^N zfIQX>f1KsT&eS>6l~5JxvV5G2lSpJnAVli(dP5y9mggu#c$F~5t!@6AL@izNMJD_j zLx|O#^Y!{7N}@wfaGvg)A{Xe8W1fclqNZF?*mH^=>R?!9!^cw9=$4ES<)__zl#;S9 zXDMBxIvnq3B{h^zblALhUe+%LMVVnZcPFJRQAe4eqJ~8(ii+eG-HeOx63J+(uac0J zo|k1V*d5Hs2G0jVanX*)Wu6;nm8eU(`id&KFi|iye`Zkf`b#2u$6mPP^-m`~ZnN&I z_$eD+5H){X7D7>01dt)yyiFhC$Wr_(1RxAOZ~<~K0#k4U)|>;^7;9U$<$UdWe0n7R zLIQ*M{o4=&xW2l(_u9^O%(e#y2AwyQF&$?H$A|$x{z7ytWfGrH}|X5TG_@! zZ5xnL>iV)<@_e7pu+GVi%el(ZN%OA)^;zObHsfxj%|9R06ls95EHg$_9?`6a+>_0h z*E@vxNxrCYu9$KgynCN$5F>~3?z)Gh*rT2x+XXkDnV)zc1OmH&CcI*)?0>}$8+c27 zq&_SMZaob5FEmg7MW9t@9=J|_IIf>7-)B`&j2mYCs;ORxE@7&isK^P7sv9xTHjF7e z<5Yli7x~xzxqqg{v{ li { + position: relative; +} +.fc-li { + position: absolute; + left: -2.2em; + width: 2.2em; + top: 0.15em; + text-align: center; +} +.fc-li.fa-lg { + left: -1.9em; +} +.fc-pull-left { + float: left; +} +.fc-pull-right { + float: right; +} +.fc.fc-pull-left { + margin-right: .3em; +} +.fc.fa-pull-right { + margin-left: .3em; +} +.fc-fw { + width: 1.3em; + text-align: center; +} +.fc-rotate-90 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)"; + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} +.fc-rotate-180 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)"; + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.fc-rotate-270 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)"; + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); +} +.fc-flip-horizontal { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.fc-flip-vertical { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); +} +.fc-spin { + -webkit-animation: fc-spin 2s infinite linear; + animation: fc-spin 2s infinite linear; +} +.fc-pulse { + -webkit-animation: fc-spin 1s infinite steps(8); + animation: fc-spin 1s infinite steps(8); +} +.fc-rotate { + -webkit-animation: fc-rotate 2s infinite linear; + animation: fc-rotate 2s infinite linear; +} + +@-webkit-keyframes fc-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes fc-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-webkit-keyframes fc-rotate { + 0% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=0)"; + -webkit-transform: scale(1, 1); + -ms-transform: scale(1, 1); + transform: scale(1, 1); + } + 100% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } +} +@keyframes fc-rotate { + 0% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=0)"; + -webkit-transform: scale(1, 1); + -ms-transform: scale(1, 1); + transform: scale(1, 1); + } + 100% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } +} + +/* icons */ .fc-life-saver:before { content: "0"; } .fc-new-request:before { content: "1"; } +.fc-new-request-o:before { + content: "4"; +} .fc-ongoing-request:before { content: "2"; } .fc-closed-request:before { content: "3"; } -.fc-combodo-icon:before { +.fc-combodo-icon-o:before { content: "C"; } +.fc-combodo-icon:before { + content: "D"; +} .fc-itop-icon:before { content: "I"; } diff --git a/css/font-combodo/glyphs/4.svg b/css/font-combodo/glyphs/4.svg new file mode 100644 index 000000000..9e807f579 --- /dev/null +++ b/css/font-combodo/glyphs/4.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/css/font-combodo/glyphs/D.svg b/css/font-combodo/glyphs/D.svg new file mode 100644 index 000000000..78fba5683 --- /dev/null +++ b/css/font-combodo/glyphs/D.svg @@ -0,0 +1,23 @@ + + + + + + diff --git a/css/font-combodo/test.html b/css/font-combodo/test.html new file mode 100644 index 000000000..c1a102a8e --- /dev/null +++ b/css/font-combodo/test.html @@ -0,0 +1,81 @@ + + + +Combodo Font test page + + + + + +

Combodo Font test page

+

Parameters

+
+

Text color:

+

Icon size:

+

Rotation:

+

Flip: (NB: flip and rotation cannot be combined)

+

Animation:

+ +
+

Icons

+
+ + + + + \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 45b45e52f..cee619db8 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -417,6 +417,7 @@ class ApplicationHelper */ static function LoadCurrentUser(Application $oApp) { + // User $oUser = UserRights::GetUserObject(); if ($oUser === null) { @@ -425,7 +426,8 @@ class ApplicationHelper $oApp['combodo.current_user'] = $oUser; - $sUrl = $oApp['combodo.portal.base.absolute_url'].'img/user-profile-default-256px.png'; + // Contact + $sContactPhotoUrl = $oApp['combodo.portal.base.absolute_url'] . 'img/user-profile-default-256px.png'; $oContact = UserRights::GetContactObject(); if ($oContact) { @@ -434,15 +436,15 @@ class ApplicationHelper $oImage = $oContact->Get('picture'); if (is_object($oImage) && !$oImage->IsEmpty()) { - $sUrl = $oImage->GetDownloadURL(get_class($oContact), $oContact->GetKey(), 'picture'); + $sContactPhotoUrl = $oImage->GetDownloadURL(get_class($oContact), $oContact->GetKey(), 'picture'); } else { - $sUrl = MetaModel::GetAttributeDef(get_class($oContact), 'picture')->Get('default_image'); + $sContactPhotoUrl = MetaModel::GetAttributeDef(get_class($oContact), 'picture')->Get('default_image'); } } } - $oApp['combodo.current_user_img'] = $sUrl; + $oApp['combodo.current_contact.photo_url'] = $sContactPhotoUrl; } /** diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig index 20eb48517..7c48e0b4c 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig @@ -38,10 +38,12 @@

Photo

-
+
- + +
+
Picture edition not available in beta
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index b180acc2c..f6443757d 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -5,7 +5,7 @@ {% set bUserConnected = true %} {% set sUserFullname = app['combodo.current_user'].Get('first_name') ~ ' ' ~ app['combodo.current_user'].Get('last_name') %} {% set sUserEmail = app['combodo.current_user'].Get('email') %} - {% set sUserPhotoUrl = app['combodo.current_user_img'] %} + {% set sUserPhotoUrl = app['combodo.current_contact.photo_url'] %} {% else %} {% set bUserConnected = false %} {% set sUserFullname = '' %} @@ -100,7 +100,7 @@ {% block pPageBodyWrapper %} {% block pNavigationWrapper %} {# Topbar navigation menu for mobile screens #} -