mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Customer portal : UI improvements
SVN:trunk[4133]
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -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
|
||||
|
||||
Binary file not shown.
@@ -4,4 +4,4 @@
|
||||
#
|
||||
glyphs
|
||||
combodo.sfd
|
||||
combodo.ttf
|
||||
test.html
|
||||
@@ -1,7 +1,8 @@
|
||||
@font-face {
|
||||
font-family: 'CombodoRegular';
|
||||
src: url('combodo-webfont.woff2') format('woff2'),
|
||||
url('combodo-webfont.woff') format('woff');
|
||||
src: url('combodo-webfont.woff2?v=1.0') format('woff2'),
|
||||
url('combodo-webfont.woff?v=1.0') format('woff'),
|
||||
url('combodo-webfont.ttf?v=1.0') format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
@@ -21,6 +22,12 @@
|
||||
line-height: 0.75em;
|
||||
vertical-align: -15%;
|
||||
}
|
||||
.fc-1-5x {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
.fc-1-6x {
|
||||
font-size: 1.6em;
|
||||
}
|
||||
.fc-2x {
|
||||
font-size: 2em;
|
||||
}
|
||||
@@ -33,21 +40,159 @@
|
||||
.fc-5x {
|
||||
font-size: 5em;
|
||||
}
|
||||
.fc-border {
|
||||
padding: .2em .25em .15em;
|
||||
border: solid 0.08em #eeeeee;
|
||||
border-radius: .1em;
|
||||
}
|
||||
.fc-ul {
|
||||
padding-left: 0;
|
||||
margin-left: 2.2em;
|
||||
list-style-type: none;
|
||||
}
|
||||
.fc-ul > 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";
|
||||
}
|
||||
|
||||
20
css/font-combodo/glyphs/4.svg
Normal file
20
css/font-combodo/glyphs/4.svg
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
|
||||
<svg version="1.1" baseProfile="basic" id="Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
|
||||
viewBox="0 0 1000 1000" xml:space="preserve">
|
||||
<path d="M782.403,865.469l-154.508-84.653c-41.386,10.247-84.155,20.761-126.938,20.761c-103.692,0-200.729-34.312-273.236-96.612
|
||||
c-35.467-30.476-63.322-66.095-82.789-105.866c-20.192-41.251-30.43-85.147-30.43-130.469c0-45.334,10.238-89.239,30.43-130.493
|
||||
c19.467-39.773,47.321-75.391,82.79-105.864c72.499-62.287,169.535-96.59,273.235-96.59c49.85,0,98.952,8.694,145.943,25.842
|
||||
c45.657,16.661,87.014,40.417,122.923,70.61c36.458,30.654,65.213,66.204,85.467,105.661
|
||||
c21.372,41.634,32.208,85.653,32.208,130.834c0,49.914-15.553,99.344-46.225,146.918c-24.909,38.634-59.118,75.12-101.793,108.597
|
||||
L782.403,865.469L782.403,865.469z M633.438,738.242l82.198,45.035l-22.539-74.211l11.251-8.401
|
||||
c92.312-68.938,143.15-151.343,143.15-232.036c0-158.793-158.696-292.947-346.541-292.947
|
||||
c-191.036,0-346.455,131.416-346.455,292.947s155.419,292.947,346.455,292.947c38.218,0,77.086-9.624,118.235-19.813
|
||||
L633.438,738.242L633.438,738.242z"/>
|
||||
<path d="M658.965,500.679c0,7.801-7.768,14.133-17.219,14.133H537.102v104.612c0,9.542-6.373,17.252-14.184,17.252h-77.889
|
||||
c-7.852,0-14.184-7.71-14.184-17.252V514.812H326.252c-9.501,0-17.22-6.332-17.22-14.133V422.78c0-7.892,7.719-14.224,17.22-14.224
|
||||
h104.597V303.953c0-9.451,6.331-17.178,14.183-17.178h77.889c7.811,0,14.184,7.727,14.184,17.178v104.604h104.645
|
||||
c9.453,0,17.221,6.332,17.221,14.224v77.898H658.965z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
23
css/font-combodo/glyphs/D.svg
Normal file
23
css/font-combodo/glyphs/D.svg
Normal file
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
|
||||
<svg version="1.1" baseProfile="basic" id="Layer_1"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
|
||||
viewBox="0 0 1000 1000" xml:space="preserve">
|
||||
<path d="M431.95,881.456c-32.777,20.049-67-28.318-71.182-41.602c-4.181-13.314-6.211-47.199-6.211-47.199
|
||||
s-71.674-54.916-69.768-79.485c1.875-24.567,24.261-72.135,72.996-110.647c21.216-16.758,71.336-22.554,71.336-22.554
|
||||
s-19.218-34.085-57.131-41.726c-17.987-3.628-29.149,5.98-37.359,9.854c-53.01,24.938-88.432,71.337-105.897,75.058
|
||||
c-17.035,3.674-85.389-53.164-85.389-53.164l-27.028,28.749c0,0-26.597,18.495-35.515-1.322
|
||||
c-8.917-19.816-6.334-86.126-6.334-86.126s5.012-24.245,18.911-32.101c13.929-7.857,118.903,59.375,118.903,59.375l106.575-60.575
|
||||
l6.764-41.817c0,0-81.545-67.17-90.185-102.5c-11.653-47.537,19.925-132.495,51.78-149.13
|
||||
c24.476-12.791,103.53-1.507,139.875,46.707c32.132,42.633,15.128,119.98,15.128,119.98l33.885,0.661l25.982-21.584l50.305-27.704
|
||||
l-17.28-31.794l-39.512-7.749c0,0-33.454-90.631-8.179-106.974s90.061,16.343,90.061,16.343l34.592,63.603
|
||||
c0,0,51.72,38.344,46.523,59.96c-5.166,21.616-80.007,74.918-97.688,106.466c-22.63,40.341,38.375,74.979,38.375,74.979
|
||||
s31.578-33.393,47.137-52.611c15.527-19.248,70.045-65.155,97.012-67.354c26.966-2.198,81.053,51.734,105.805,47.337
|
||||
c11.593-1.122,65.74-17.833,72.873,0.569c7.134,18.403-20.201,82.543-38.742,94.167c-18.541,11.592-116.968-52.887-147.285-43.509
|
||||
c-30.318,9.409-44.677,86.803-69.952,135.416c37.206,30.486,56.146,99.426,46.86,156.063
|
||||
c-7.503,45.907-75.58,150.269-92.337,141.352c-16.789-8.918,23.061-61.035,29.795-103.039
|
||||
c6.765-41.972-58.668-111.954-78.439-120.81c-20.109,8.087-62.173,19.617-84.835,19.894c-22.63,0.277-27.919-15.281-42.679-18.525
|
||||
c-14.79-3.229-70.045,26.645-72.966,41.188c-2.921,14.544,64.295,57.101,77.548,69.892
|
||||
C462.33,790.227,461.991,863.071,431.95,881.456z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
81
css/font-combodo/test.html
Normal file
81
css/font-combodo/test.html
Normal file
@@ -0,0 +1,81 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Combodo Font test page</title>
|
||||
<link rel="stylesheet" type="text/css" href="./font-combodo.css" />
|
||||
<style>
|
||||
body {
|
||||
font-size: 10pt;
|
||||
font-family: Verdana, Arial, Helvetica;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
aIcons = {
|
||||
'new-request': 'New request',
|
||||
'new-request-o': 'New request (outline)',
|
||||
'ongoing-request': 'On-going request',
|
||||
'closed-request': 'Closed request',
|
||||
'combodo-icon': 'Combodo icon',
|
||||
'combodo-icon-o': 'Combodo icon (outline)',
|
||||
'itop-icon': 'iTop icon',
|
||||
}
|
||||
|
||||
function GenerateTable() {
|
||||
var sHtml = '';
|
||||
for(var k in aIcons)
|
||||
{
|
||||
var sClass = 'fc fc-'+k;
|
||||
var sColor = document.getElementById('color').value;
|
||||
var sSize = document.getElementById('size').value;
|
||||
if (sSize != '')
|
||||
{
|
||||
sClass += ' fc-'+sSize;
|
||||
}
|
||||
var sRotation = document.getElementById('rotation').value;
|
||||
if (sRotation != '')
|
||||
{
|
||||
sClass += ' fc-rotate-'+sRotation;
|
||||
}
|
||||
var sFlip = document.getElementById('flip').value;
|
||||
if (sFlip != '')
|
||||
{
|
||||
sClass += ' fc-flip-'+sFlip;
|
||||
}
|
||||
var sAnimation = document.getElementById('animation').value;
|
||||
if (sAnimation != '')
|
||||
{
|
||||
sClass += ' fc-'+sAnimation;
|
||||
}
|
||||
var sStyle= 'color: '+sColor;
|
||||
var sTitle = sClass;
|
||||
sHtml += '<div title="'+sTitle+'"><span class="'+sClass+'" style="'+sStyle+'"></span> '+aIcons[k]+'</div>';
|
||||
}
|
||||
var oElement = document.getElementById('dump');
|
||||
oElement.innerHTML = sHtml;
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Combodo Font test page</h1>
|
||||
<h2>Parameters</h2>
|
||||
<div>
|
||||
<p>Text color: <input type="text" id="color" value="#CC8800"></p>
|
||||
<p>Icon size: <select id="size"><option value="">Normal (1x)</option><option value="2x" selected>2x</option><option value="3x">3x</option><option value="4x">4x</option><option value="5x" selected>5x</option></select></p>
|
||||
<p>Rotation: <select id="rotation"><option value="" selected>None</option><option value="90">90°</option><option value="180">180°</option><option value="270">270°</option></select></p>
|
||||
<p>Flip: <select id="flip"><option value="" selected>None</option><option value="vertical">Vertical</option><option value="horizontal">Horizontal</option></select> (NB: flip and rotation cannot be combined)</p>
|
||||
<p>Animation: <select id="animation"><option value="" selected>None</option><option value="spin">Spin</option><option value="Rotate">Rotate (Experimental!)</option></select></p>
|
||||
<button type="button" onclick="GenerateTable()">Redraw !</button>
|
||||
</div>
|
||||
<h2>Icons</h2>
|
||||
<div id="dump"></div>
|
||||
|
||||
<script>
|
||||
(function() {
|
||||
// your page initialization code here
|
||||
// the DOM will be available here
|
||||
GenerateTable();
|
||||
})();
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,10 +38,12 @@
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Photo</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="panel-body" style="position: relative;">
|
||||
<div class="text-center">
|
||||
<img src="{{ sUserPhotoUrl }}" style="max-width: 175px;"/>
|
||||
<input type="file" id="xx" name="xx" />
|
||||
<!--<input type="file" id="xx" name="xx" />-->
|
||||
<div style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; background-color: #000000; opacity: 0.5;"></div>
|
||||
<div style="position: absolute; bottom: 0.5em; left: 0px; width: 100%; color: #FFFFFF; font-size: 1.5em; font-style: italic;">Picture edition not available in beta</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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 #}
|
||||
<nav class="navbar navbar-fixed-top navbar-inverse visible-xs" id="topbar" role="navigation">
|
||||
<nav class="navbar navbar-fixed-top navbar-default visible-xs" id="topbar" role="navigation">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar">
|
||||
@@ -108,10 +108,16 @@
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{{ app.url_generator.generate('p_home') }}">iTop</a>
|
||||
<a class="navbar-brand pull-right" href="{{ app.url_generator.generate('p_home') }}">
|
||||
{% if app['combodo.portal.instance.conf'].properties.logo is not null %}
|
||||
<img src="{{ app['combodo.portal.instance.conf'].properties.logo }}" alt="{{ app['combodo.portal.instance.conf'].properties.name|dict_s }}" />
|
||||
{% else %}
|
||||
iTop
|
||||
{% endif %}
|
||||
</a>
|
||||
<p class="navbar-text">
|
||||
<a class="navbar-link user_infos" href="{{ app.url_generator.generate('p_user_profile_brick') }}">
|
||||
<span class="user_photo"><img src="{{ sUserPhotoUrl }}" alt="{{ sUserFullname }}" /></span>
|
||||
<span class="user_photo" style="background-image: url('{{ sUserPhotoUrl }}');"></span>
|
||||
<span class="user_fullname">{{ sUserFullname }}</span>
|
||||
</a>
|
||||
</p>
|
||||
@@ -121,7 +127,7 @@
|
||||
{% block pNavigationTopBricks %}
|
||||
<li class="{% if oBrick is not defined %}active{% endif %}">
|
||||
<a href="{{ app.url_generator.generate('p_home') }}">
|
||||
<span class="brick_icon fa fa-home"></span>
|
||||
<span class="brick_icon fa fa-home fa-2x"></span>
|
||||
{{ 'Page:Home'|dict_s }}
|
||||
</a>
|
||||
</li>
|
||||
@@ -166,8 +172,7 @@
|
||||
{# Sidebar navigation menu for normal screens #}
|
||||
<nav class="navbar-default hidden-xs col-sm-3 col-md-2" id="sidebar" role="navigation">
|
||||
<div class="user_card">
|
||||
<div class="user_photo">
|
||||
<img src="{{ sUserPhotoUrl }}" alt="{{ sUserFullname }}" />
|
||||
<div class="user_photo" style="background-image: url('{{ sUserPhotoUrl }}');">
|
||||
</div>
|
||||
<div class="user_infos">
|
||||
<div class="user_fullname">{{ sUserFullname }}</div>
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
body{
|
||||
padding-top: 60px;
|
||||
}
|
||||
body.home{
|
||||
padding-top: 70px;
|
||||
}
|
||||
}
|
||||
footer{
|
||||
margin: 5em 1em;
|
||||
@@ -19,23 +22,47 @@ footer{
|
||||
margin-right: 20px;
|
||||
}
|
||||
/* Topbar */
|
||||
#topbar #navbar{
|
||||
#topbar .navbar-header{
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
#topbar .navbar-collapse{
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
overflow-y: auto;
|
||||
}
|
||||
#topbar .navbar-collapse > .navbar-nav{
|
||||
padding-top: 30px;
|
||||
}
|
||||
#topbar .navbar-brand{
|
||||
padding: 5px 15px;
|
||||
}
|
||||
#topbar .navbar-brand > img{
|
||||
max-height: 100%;
|
||||
}
|
||||
#topbar .user_infos{
|
||||
text-decoration: none;
|
||||
}
|
||||
#topbar .user_photo{
|
||||
margin-right: 10px;
|
||||
}
|
||||
#topbar .user_photo img{
|
||||
margin-top: -4px;
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
height: 25px;
|
||||
position: absolute;
|
||||
display: block;
|
||||
top: 5px;
|
||||
left: 10px;
|
||||
width: 65px;
|
||||
height: 65px;
|
||||
background-size: 100%;
|
||||
background-position: center center;
|
||||
background-color: #585653;
|
||||
border: 2px solid #FFFFFF;
|
||||
border-radius: 100%;
|
||||
box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
#topbar .user_fullname{
|
||||
margin-left: 85px;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
/* Sidebar */
|
||||
@media (min-width: 768px){
|
||||
#sidebar{
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
@@ -50,12 +77,14 @@ footer{
|
||||
box-shadow: -3px 2px 3px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
#sidebar .user_card .user_photo{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
#sidebar .user_card .user_photo img{
|
||||
margin: 0px auto 10px auto;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
background-size: 100%;
|
||||
background-position: center center;
|
||||
background-color: #585653;
|
||||
border: 2px solid #FFFFFF;
|
||||
border-radius: 100%;
|
||||
width: 80px;
|
||||
}
|
||||
#sidebar .user_card .user_infos{
|
||||
font-size: 1em;
|
||||
@@ -115,6 +144,7 @@ footer{
|
||||
width: 1.2em;
|
||||
vertical-align: sub;
|
||||
text-align: center;
|
||||
margin-right: 10px;
|
||||
}
|
||||
#sidebar .logo{
|
||||
position: absolute;
|
||||
@@ -126,6 +156,20 @@ footer{
|
||||
width: 40%;
|
||||
max-width: 100%;
|
||||
}
|
||||
}
|
||||
@media (min-width: 992px){
|
||||
|
||||
}
|
||||
/* Warning : Not a offical BS breakpoint */
|
||||
@media (min-width: 1600px){
|
||||
#sidebar .user_card .user_photo{
|
||||
width: 120px;
|
||||
height: 120px;
|
||||
}
|
||||
#sidebar .menu .nav > li > a > .brick_icon{
|
||||
margin-right: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Main content */
|
||||
@media (min-width: 768px) {
|
||||
@@ -268,19 +312,46 @@ a:hover, a:focus{
|
||||
}
|
||||
|
||||
/* Navbars */
|
||||
.navbar-fixed-top .navbar-header{
|
||||
box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
.navbar-default .navbar-toggle {
|
||||
border-top: none;
|
||||
border-right: none;
|
||||
border-bottom: none;
|
||||
border-radius: 0px;
|
||||
margin-right: 0px;
|
||||
}
|
||||
.navbar-default .navbar-toggle:hover,
|
||||
.navbar-default .navbar-toggle:focus{
|
||||
background-color: inherit;
|
||||
}
|
||||
.navbar-default .navbar-toggle .icon-bar{
|
||||
height: 3px;
|
||||
}
|
||||
.navbar-default .navbar-collapse,
|
||||
.navbar-default .navbar-form{
|
||||
border: none;
|
||||
}
|
||||
|
||||
.navbar-default{
|
||||
background-color: #585653;
|
||||
border: none;
|
||||
}
|
||||
.navbar-default .nav > li > a{
|
||||
.navbar-default .nav > li > a,
|
||||
.navbar-default .nav.navbar-nav > li > a{
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.navbar-default .nav > li > a:focus,
|
||||
.navbar-default .nav > li > a:hover{
|
||||
.navbar-default .nav > li > a:hover,
|
||||
.navbar-default .nav.navbar-nav > li > a:focus,
|
||||
.navbar-default .nav.navbar-nav > li > a:hover{
|
||||
background-color: #FFFFFF;
|
||||
color: #EA7D1E;
|
||||
}
|
||||
.navbar-default .nav > li.active{
|
||||
.navbar-default .nav > li.active,
|
||||
.navbar-default .nav.navbar-nav > li.active > a{
|
||||
background-color: #292827; /* TODO Darken #585653 */
|
||||
color: #FFFFFF;
|
||||
font-weight: 600;
|
||||
@@ -294,6 +365,11 @@ a:hover, a:focus{
|
||||
background-color: #EA7D1E;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav .open .dropdown-menu > li > a{
|
||||
color: #FFFFFF;
|
||||
background-color: inherit;
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
/* - Default */
|
||||
.btn-default,
|
||||
@@ -493,7 +569,7 @@ a:hover, a:focus{
|
||||
@media (min-width: 768px) {
|
||||
.home .tile{
|
||||
display: block;
|
||||
margin-bottom: 40px;
|
||||
margin-bottom: 25px;
|
||||
padding: 40px 40px 30px 40px;
|
||||
min-height: 10em;
|
||||
text-align: left;
|
||||
@@ -506,9 +582,9 @@ a:hover, a:focus{
|
||||
display: block;
|
||||
position: relative;
|
||||
float: left;
|
||||
top: initial;
|
||||
top: 1.5em;
|
||||
left: initial;
|
||||
margin: 0px 40px 5px 0px;
|
||||
margin: 0px 30px 15px 0px;
|
||||
}
|
||||
.home .tile .tile_body{
|
||||
display: block;
|
||||
@@ -526,9 +602,29 @@ a:hover, a:focus{
|
||||
}
|
||||
@media (min-width: 992px) {
|
||||
.home .tile{
|
||||
min-height: 14em;
|
||||
padding: 30px 40px 30px 40px;
|
||||
}
|
||||
.home .tile .tile_decoration > span.icon{
|
||||
font-size: 4em;
|
||||
}
|
||||
.home .tile .tile_title{
|
||||
font-size: 1.4em;
|
||||
}
|
||||
.home .tile .tile_description{
|
||||
font-size: 1.2em;
|
||||
}
|
||||
}
|
||||
@media (min-width: 1200px) {
|
||||
.home .tile{
|
||||
margin-bottom: 40px;
|
||||
min-height: 15em;
|
||||
padding: 40px 50px 30px 50px;
|
||||
}
|
||||
.home .tile .tile_decoration{
|
||||
margin: 0px 40px 15px 0px;
|
||||
top: 1.5em;
|
||||
}
|
||||
.home .tile .tile_decoration > span.icon{
|
||||
font-size: 6em;
|
||||
}
|
||||
|
||||
@@ -1073,7 +1073,7 @@
|
||||
<class>UserRequest</class>
|
||||
<!-- Optional tag that can be used on any action type -->
|
||||
<!--<title>Créer un ticket</title>-->
|
||||
<!--<icon_class>glyphicon glyphicon-plus</icon_class>-->
|
||||
<icon_class>fc fc-new-request fc-1-6x fc-flip-horizontal</icon_class>
|
||||
<rules>
|
||||
<rule id="contact-to-userrequest"/>
|
||||
<rule id="servicesubcategory-to-userrequest"/>
|
||||
|
||||
Reference in New Issue
Block a user