# HG changeset patch # User veltr # Date 1337789787 -7200 # Node ID 37492d1ce8419f8f470f23e4b92550eca0386ea5 # Parent 03bbfd9cd3c6df7ea3d81c58376049d5dd2a4e6e Added clustering diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/.DS_Store Binary file timeline/assets/glyphicons/.DS_Store has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/.DS_Store Binary file timeline/assets/glyphicons/png/.DS_Store has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_000_glass.png Binary file timeline/assets/glyphicons/png/glyphicons_000_glass.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_001_leaf.png Binary file timeline/assets/glyphicons/png/glyphicons_001_leaf.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_002_dog.png Binary file timeline/assets/glyphicons/png/glyphicons_002_dog.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_003_user.png Binary file timeline/assets/glyphicons/png/glyphicons_003_user.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_004_girl.png Binary file timeline/assets/glyphicons/png/glyphicons_004_girl.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_005_car.png Binary file timeline/assets/glyphicons/png/glyphicons_005_car.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_006_user_add.png Binary file timeline/assets/glyphicons/png/glyphicons_006_user_add.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_007_user_remove.png Binary file timeline/assets/glyphicons/png/glyphicons_007_user_remove.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_008_film.png Binary file timeline/assets/glyphicons/png/glyphicons_008_film.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_009_magic.png Binary file timeline/assets/glyphicons/png/glyphicons_009_magic.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_010_envelope.png Binary file timeline/assets/glyphicons/png/glyphicons_010_envelope.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_011_camera.png Binary file timeline/assets/glyphicons/png/glyphicons_011_camera.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_012_heart.png Binary file timeline/assets/glyphicons/png/glyphicons_012_heart.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_013_beach_umbrella.png Binary file timeline/assets/glyphicons/png/glyphicons_013_beach_umbrella.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_014_train.png Binary file timeline/assets/glyphicons/png/glyphicons_014_train.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_015_print.png Binary file timeline/assets/glyphicons/png/glyphicons_015_print.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_016_bin.png Binary file timeline/assets/glyphicons/png/glyphicons_016_bin.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_017_music.png Binary file timeline/assets/glyphicons/png/glyphicons_017_music.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_018_note.png Binary file timeline/assets/glyphicons/png/glyphicons_018_note.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_019_cogwheel.png Binary file timeline/assets/glyphicons/png/glyphicons_019_cogwheel.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_020_home.png Binary file timeline/assets/glyphicons/png/glyphicons_020_home.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_021_snowflake.png Binary file timeline/assets/glyphicons/png/glyphicons_021_snowflake.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_022_fire.png Binary file timeline/assets/glyphicons/png/glyphicons_022_fire.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_023_cogwheels.png Binary file timeline/assets/glyphicons/png/glyphicons_023_cogwheels.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_024_parents.png Binary file timeline/assets/glyphicons/png/glyphicons_024_parents.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_025_binoculars.png Binary file timeline/assets/glyphicons/png/glyphicons_025_binoculars.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_026_road.png Binary file timeline/assets/glyphicons/png/glyphicons_026_road.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_027_search.png Binary file timeline/assets/glyphicons/png/glyphicons_027_search.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_028_cars.png Binary file timeline/assets/glyphicons/png/glyphicons_028_cars.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_029_notes_2.png Binary file timeline/assets/glyphicons/png/glyphicons_029_notes_2.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_030_pencil.png Binary file timeline/assets/glyphicons/png/glyphicons_030_pencil.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_031_bus.png Binary file timeline/assets/glyphicons/png/glyphicons_031_bus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_032_wifi_alt.png Binary file timeline/assets/glyphicons/png/glyphicons_032_wifi_alt.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_033_luggage.png Binary file timeline/assets/glyphicons/png/glyphicons_033_luggage.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_034_old_man.png Binary file timeline/assets/glyphicons/png/glyphicons_034_old_man.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_035_woman.png Binary file timeline/assets/glyphicons/png/glyphicons_035_woman.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_036_file.png Binary file timeline/assets/glyphicons/png/glyphicons_036_file.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_037_credit.png Binary file timeline/assets/glyphicons/png/glyphicons_037_credit.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_038_airplane.png Binary file timeline/assets/glyphicons/png/glyphicons_038_airplane.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_039_notes.png Binary file timeline/assets/glyphicons/png/glyphicons_039_notes.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_040_stats.png Binary file timeline/assets/glyphicons/png/glyphicons_040_stats.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_041_charts.png Binary file timeline/assets/glyphicons/png/glyphicons_041_charts.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_042_pie_chart.png Binary file timeline/assets/glyphicons/png/glyphicons_042_pie_chart.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_043_group.png Binary file timeline/assets/glyphicons/png/glyphicons_043_group.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_044_keys.png Binary file timeline/assets/glyphicons/png/glyphicons_044_keys.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_045_calendar.png Binary file timeline/assets/glyphicons/png/glyphicons_045_calendar.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_046_router.png Binary file timeline/assets/glyphicons/png/glyphicons_046_router.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_047_camera_small.png Binary file timeline/assets/glyphicons/png/glyphicons_047_camera_small.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_048_dislikes.png Binary file timeline/assets/glyphicons/png/glyphicons_048_dislikes.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_049_star.png Binary file timeline/assets/glyphicons/png/glyphicons_049_star.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_050_link.png Binary file timeline/assets/glyphicons/png/glyphicons_050_link.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_051_eye_open.png Binary file timeline/assets/glyphicons/png/glyphicons_051_eye_open.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_052_eye_close.png Binary file timeline/assets/glyphicons/png/glyphicons_052_eye_close.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_053_alarm.png Binary file timeline/assets/glyphicons/png/glyphicons_053_alarm.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_054_clock.png Binary file timeline/assets/glyphicons/png/glyphicons_054_clock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_055_stopwatch.png Binary file timeline/assets/glyphicons/png/glyphicons_055_stopwatch.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_056_projector.png Binary file timeline/assets/glyphicons/png/glyphicons_056_projector.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_057_history.png Binary file timeline/assets/glyphicons/png/glyphicons_057_history.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_058_truck.png Binary file timeline/assets/glyphicons/png/glyphicons_058_truck.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_059_cargo.png Binary file timeline/assets/glyphicons/png/glyphicons_059_cargo.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_060_compass.png Binary file timeline/assets/glyphicons/png/glyphicons_060_compass.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_061_keynote.png Binary file timeline/assets/glyphicons/png/glyphicons_061_keynote.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_062_attach.png Binary file timeline/assets/glyphicons/png/glyphicons_062_attach.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_063_power.png Binary file timeline/assets/glyphicons/png/glyphicons_063_power.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_064_lightbulb.png Binary file timeline/assets/glyphicons/png/glyphicons_064_lightbulb.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_065_tag.png Binary file timeline/assets/glyphicons/png/glyphicons_065_tag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_066_tags.png Binary file timeline/assets/glyphicons/png/glyphicons_066_tags.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_067_cleaning.png Binary file timeline/assets/glyphicons/png/glyphicons_067_cleaning.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_068_ruller.png Binary file timeline/assets/glyphicons/png/glyphicons_068_ruller.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_069_gift.png Binary file timeline/assets/glyphicons/png/glyphicons_069_gift.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_070_umbrella.png Binary file timeline/assets/glyphicons/png/glyphicons_070_umbrella.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_071_book.png Binary file timeline/assets/glyphicons/png/glyphicons_071_book.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_072_bookmark.png Binary file timeline/assets/glyphicons/png/glyphicons_072_bookmark.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_073_signal.png Binary file timeline/assets/glyphicons/png/glyphicons_073_signal.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_074_cup.png Binary file timeline/assets/glyphicons/png/glyphicons_074_cup.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_075_stroller.png Binary file timeline/assets/glyphicons/png/glyphicons_075_stroller.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_076_headphones.png Binary file timeline/assets/glyphicons/png/glyphicons_076_headphones.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_077_headset.png Binary file timeline/assets/glyphicons/png/glyphicons_077_headset.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_078_warning_sign.png Binary file timeline/assets/glyphicons/png/glyphicons_078_warning_sign.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_079_signal.png Binary file timeline/assets/glyphicons/png/glyphicons_079_signal.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_080_retweet.png Binary file timeline/assets/glyphicons/png/glyphicons_080_retweet.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_081_refresh.png Binary file timeline/assets/glyphicons/png/glyphicons_081_refresh.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_082_roundabout.png Binary file timeline/assets/glyphicons/png/glyphicons_082_roundabout.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_083_random.png Binary file timeline/assets/glyphicons/png/glyphicons_083_random.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_084_heat.png Binary file timeline/assets/glyphicons/png/glyphicons_084_heat.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_085_repeat.png Binary file timeline/assets/glyphicons/png/glyphicons_085_repeat.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_086_display.png Binary file timeline/assets/glyphicons/png/glyphicons_086_display.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_087_log_book.png Binary file timeline/assets/glyphicons/png/glyphicons_087_log_book.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_088_adress_book.png Binary file timeline/assets/glyphicons/png/glyphicons_088_adress_book.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_089_magnet.png Binary file timeline/assets/glyphicons/png/glyphicons_089_magnet.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_090_table.png Binary file timeline/assets/glyphicons/png/glyphicons_090_table.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_091_adjust.png Binary file timeline/assets/glyphicons/png/glyphicons_091_adjust.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_092_tint.png Binary file timeline/assets/glyphicons/png/glyphicons_092_tint.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_093_crop.png Binary file timeline/assets/glyphicons/png/glyphicons_093_crop.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_094_vector_path_square.png Binary file timeline/assets/glyphicons/png/glyphicons_094_vector_path_square.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_095_vector_path_circle.png Binary file timeline/assets/glyphicons/png/glyphicons_095_vector_path_circle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_096_vector_path_polygon.png Binary file timeline/assets/glyphicons/png/glyphicons_096_vector_path_polygon.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_097_vector_path_line.png Binary file timeline/assets/glyphicons/png/glyphicons_097_vector_path_line.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_098_vector_path_curve.png Binary file timeline/assets/glyphicons/png/glyphicons_098_vector_path_curve.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_099_vector_path_all.png Binary file timeline/assets/glyphicons/png/glyphicons_099_vector_path_all.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_100_font.png Binary file timeline/assets/glyphicons/png/glyphicons_100_font.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_101_italic.png Binary file timeline/assets/glyphicons/png/glyphicons_101_italic.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_102_bold.png Binary file timeline/assets/glyphicons/png/glyphicons_102_bold.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_103_text_underline.png Binary file timeline/assets/glyphicons/png/glyphicons_103_text_underline.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_104_text_strike.png Binary file timeline/assets/glyphicons/png/glyphicons_104_text_strike.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_105_text_height.png Binary file timeline/assets/glyphicons/png/glyphicons_105_text_height.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_106_text_width.png Binary file timeline/assets/glyphicons/png/glyphicons_106_text_width.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_107_text_resize.png Binary file timeline/assets/glyphicons/png/glyphicons_107_text_resize.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_108_left_indent.png Binary file timeline/assets/glyphicons/png/glyphicons_108_left_indent.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_109_right_indent.png Binary file timeline/assets/glyphicons/png/glyphicons_109_right_indent.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_110_align_left.png Binary file timeline/assets/glyphicons/png/glyphicons_110_align_left.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_111_align_center.png Binary file timeline/assets/glyphicons/png/glyphicons_111_align_center.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_112_align_right.png Binary file timeline/assets/glyphicons/png/glyphicons_112_align_right.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_113_justify.png Binary file timeline/assets/glyphicons/png/glyphicons_113_justify.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_114_list.png Binary file timeline/assets/glyphicons/png/glyphicons_114_list.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_115_text_smaller.png Binary file timeline/assets/glyphicons/png/glyphicons_115_text_smaller.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_116_text_bigger.png Binary file timeline/assets/glyphicons/png/glyphicons_116_text_bigger.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_117_embed.png Binary file timeline/assets/glyphicons/png/glyphicons_117_embed.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_118_embed_close.png Binary file timeline/assets/glyphicons/png/glyphicons_118_embed_close.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_119_adjust.png Binary file timeline/assets/glyphicons/png/glyphicons_119_adjust.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_120_message_full.png Binary file timeline/assets/glyphicons/png/glyphicons_120_message_full.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_121_message_empty.png Binary file timeline/assets/glyphicons/png/glyphicons_121_message_empty.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_122_message_in.png Binary file timeline/assets/glyphicons/png/glyphicons_122_message_in.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_123_message_out.png Binary file timeline/assets/glyphicons/png/glyphicons_123_message_out.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_124_message_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_124_message_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_125_message_minus.png Binary file timeline/assets/glyphicons/png/glyphicons_125_message_minus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_126_message_ban.png Binary file timeline/assets/glyphicons/png/glyphicons_126_message_ban.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_127_message_flag.png Binary file timeline/assets/glyphicons/png/glyphicons_127_message_flag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_128_message_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_128_message_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_129_message_new.png Binary file timeline/assets/glyphicons/png/glyphicons_129_message_new.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_130_inbox.png Binary file timeline/assets/glyphicons/png/glyphicons_130_inbox.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_131_inbox_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_131_inbox_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_132_inbox_minus.png Binary file timeline/assets/glyphicons/png/glyphicons_132_inbox_minus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_133_inbox_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_133_inbox_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_134_inbox_in.png Binary file timeline/assets/glyphicons/png/glyphicons_134_inbox_in.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_135_inbox_out.png Binary file timeline/assets/glyphicons/png/glyphicons_135_inbox_out.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_136_computer_locked.png Binary file timeline/assets/glyphicons/png/glyphicons_136_computer_locked.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_137_computer_service.png Binary file timeline/assets/glyphicons/png/glyphicons_137_computer_service.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_138_computer_proces.png Binary file timeline/assets/glyphicons/png/glyphicons_138_computer_proces.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_139_phone.png Binary file timeline/assets/glyphicons/png/glyphicons_139_phone.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_140_database_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_140_database_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_141_database_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_141_database_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_142_database_minus.png Binary file timeline/assets/glyphicons/png/glyphicons_142_database_minus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_143_database_ban.png Binary file timeline/assets/glyphicons/png/glyphicons_143_database_ban.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_144_folder_open.png Binary file timeline/assets/glyphicons/png/glyphicons_144_folder_open.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_145_folder_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_145_folder_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_146_folder_minus.png Binary file timeline/assets/glyphicons/png/glyphicons_146_folder_minus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_147_folder_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_147_folder_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_148_folder_flag.png Binary file timeline/assets/glyphicons/png/glyphicons_148_folder_flag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_149_folder_new.png Binary file timeline/assets/glyphicons/png/glyphicons_149_folder_new.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_150_check.png Binary file timeline/assets/glyphicons/png/glyphicons_150_check.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_151_edit.png Binary file timeline/assets/glyphicons/png/glyphicons_151_edit.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_152_new_window.png Binary file timeline/assets/glyphicons/png/glyphicons_152_new_window.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_153_more_windows.png Binary file timeline/assets/glyphicons/png/glyphicons_153_more_windows.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_154_show_big_thumbnails.png Binary file timeline/assets/glyphicons/png/glyphicons_154_show_big_thumbnails.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_155_show_thumbnails.png Binary file timeline/assets/glyphicons/png/glyphicons_155_show_thumbnails.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_156_show_thumbnails_with_lines.png Binary file timeline/assets/glyphicons/png/glyphicons_156_show_thumbnails_with_lines.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_157_show_lines.png Binary file timeline/assets/glyphicons/png/glyphicons_157_show_lines.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_158_playlist.png Binary file timeline/assets/glyphicons/png/glyphicons_158_playlist.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_159_picture.png Binary file timeline/assets/glyphicons/png/glyphicons_159_picture.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_160_imac.png Binary file timeline/assets/glyphicons/png/glyphicons_160_imac.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_161_macbook.png Binary file timeline/assets/glyphicons/png/glyphicons_161_macbook.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_162_ipad.png Binary file timeline/assets/glyphicons/png/glyphicons_162_ipad.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_163_iphone.png Binary file timeline/assets/glyphicons/png/glyphicons_163_iphone.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_164_iphone_transfer.png Binary file timeline/assets/glyphicons/png/glyphicons_164_iphone_transfer.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_165_iphone_exchange.png Binary file timeline/assets/glyphicons/png/glyphicons_165_iphone_exchange.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_166_ipod.png Binary file timeline/assets/glyphicons/png/glyphicons_166_ipod.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_167_ipod_shuffle.png Binary file timeline/assets/glyphicons/png/glyphicons_167_ipod_shuffle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_168_ear_plugs.png Binary file timeline/assets/glyphicons/png/glyphicons_168_ear_plugs.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_169_albums.png Binary file timeline/assets/glyphicons/png/glyphicons_169_albums.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_170_step_backward.png Binary file timeline/assets/glyphicons/png/glyphicons_170_step_backward.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_171_fast_backward.png Binary file timeline/assets/glyphicons/png/glyphicons_171_fast_backward.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_172_rewind.png Binary file timeline/assets/glyphicons/png/glyphicons_172_rewind.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_173_play.png Binary file timeline/assets/glyphicons/png/glyphicons_173_play.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_174_pause.png Binary file timeline/assets/glyphicons/png/glyphicons_174_pause.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_175_stop.png Binary file timeline/assets/glyphicons/png/glyphicons_175_stop.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_176_forward.png Binary file timeline/assets/glyphicons/png/glyphicons_176_forward.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_177_fast_forward.png Binary file timeline/assets/glyphicons/png/glyphicons_177_fast_forward.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_178_step_forward.png Binary file timeline/assets/glyphicons/png/glyphicons_178_step_forward.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_179_eject.png Binary file timeline/assets/glyphicons/png/glyphicons_179_eject.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_180_facetime_video.png Binary file timeline/assets/glyphicons/png/glyphicons_180_facetime_video.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_181_download_alt.png Binary file timeline/assets/glyphicons/png/glyphicons_181_download_alt.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_182_mute.png Binary file timeline/assets/glyphicons/png/glyphicons_182_mute.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_183_volume_down.png Binary file timeline/assets/glyphicons/png/glyphicons_183_volume_down.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_184_volume_up.png Binary file timeline/assets/glyphicons/png/glyphicons_184_volume_up.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_185_screenshot.png Binary file timeline/assets/glyphicons/png/glyphicons_185_screenshot.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_186_move.png Binary file timeline/assets/glyphicons/png/glyphicons_186_move.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_187_more.png Binary file timeline/assets/glyphicons/png/glyphicons_187_more.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_188_brightness_reduce.png Binary file timeline/assets/glyphicons/png/glyphicons_188_brightness_reduce.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_189_brightness_increase.png Binary file timeline/assets/glyphicons/png/glyphicons_189_brightness_increase.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_190_circle_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_190_circle_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_191_circle_minus.png Binary file timeline/assets/glyphicons/png/glyphicons_191_circle_minus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_192_circle_remove.png Binary file timeline/assets/glyphicons/png/glyphicons_192_circle_remove.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_193_circle_ok.png Binary file timeline/assets/glyphicons/png/glyphicons_193_circle_ok.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_194_circle_question_mark.png Binary file timeline/assets/glyphicons/png/glyphicons_194_circle_question_mark.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_195_circle_info.png Binary file timeline/assets/glyphicons/png/glyphicons_195_circle_info.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_196_circle_exclamation_mark.png Binary file timeline/assets/glyphicons/png/glyphicons_196_circle_exclamation_mark.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_197_remove.png Binary file timeline/assets/glyphicons/png/glyphicons_197_remove.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_198_ok.png Binary file timeline/assets/glyphicons/png/glyphicons_198_ok.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_199_ban.png Binary file timeline/assets/glyphicons/png/glyphicons_199_ban.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_200_download.png Binary file timeline/assets/glyphicons/png/glyphicons_200_download.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_201_upload.png Binary file timeline/assets/glyphicons/png/glyphicons_201_upload.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_202_shopping_cart.png Binary file timeline/assets/glyphicons/png/glyphicons_202_shopping_cart.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_203_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_203_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_204_unlock.png Binary file timeline/assets/glyphicons/png/glyphicons_204_unlock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_205_electricity.png Binary file timeline/assets/glyphicons/png/glyphicons_205_electricity.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_206_ok_2.png Binary file timeline/assets/glyphicons/png/glyphicons_206_ok_2.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_207_remove_2.png Binary file timeline/assets/glyphicons/png/glyphicons_207_remove_2.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_208_cart_out.png Binary file timeline/assets/glyphicons/png/glyphicons_208_cart_out.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_209_cart_in.png Binary file timeline/assets/glyphicons/png/glyphicons_209_cart_in.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_210_left_arrow.png Binary file timeline/assets/glyphicons/png/glyphicons_210_left_arrow.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_211_right_arrow.png Binary file timeline/assets/glyphicons/png/glyphicons_211_right_arrow.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_212_down_arrow.png Binary file timeline/assets/glyphicons/png/glyphicons_212_down_arrow.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_213_up_arrow.png Binary file timeline/assets/glyphicons/png/glyphicons_213_up_arrow.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_214_resize_small.png Binary file timeline/assets/glyphicons/png/glyphicons_214_resize_small.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_215_resize_full.png Binary file timeline/assets/glyphicons/png/glyphicons_215_resize_full.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_216_circle_arrow_left.png Binary file timeline/assets/glyphicons/png/glyphicons_216_circle_arrow_left.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_217_circle_arrow_right.png Binary file timeline/assets/glyphicons/png/glyphicons_217_circle_arrow_right.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_218_circle_arrow_top.png Binary file timeline/assets/glyphicons/png/glyphicons_218_circle_arrow_top.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_219_circle_arrow_down.png Binary file timeline/assets/glyphicons/png/glyphicons_219_circle_arrow_down.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_220_play_button.png Binary file timeline/assets/glyphicons/png/glyphicons_220_play_button.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_221_unshare.png Binary file timeline/assets/glyphicons/png/glyphicons_221_unshare.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_222_share.png Binary file timeline/assets/glyphicons/png/glyphicons_222_share.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_223_thin_right_arrow.png Binary file timeline/assets/glyphicons/png/glyphicons_223_thin_right_arrow.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_224_thin_arrow_left.png Binary file timeline/assets/glyphicons/png/glyphicons_224_thin_arrow_left.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_225_bluetooth.png Binary file timeline/assets/glyphicons/png/glyphicons_225_bluetooth.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_226_euro.png Binary file timeline/assets/glyphicons/png/glyphicons_226_euro.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_227_usd.png Binary file timeline/assets/glyphicons/png/glyphicons_227_usd.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_228_bp.png Binary file timeline/assets/glyphicons/png/glyphicons_228_bp.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_229_retweet_2.png Binary file timeline/assets/glyphicons/png/glyphicons_229_retweet_2.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_230_moon.png Binary file timeline/assets/glyphicons/png/glyphicons_230_moon.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_231_sun.png Binary file timeline/assets/glyphicons/png/glyphicons_231_sun.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_232_cloud.png Binary file timeline/assets/glyphicons/png/glyphicons_232_cloud.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_233_direction.png Binary file timeline/assets/glyphicons/png/glyphicons_233_direction.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_234_brush.png Binary file timeline/assets/glyphicons/png/glyphicons_234_brush.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_235_pen.png Binary file timeline/assets/glyphicons/png/glyphicons_235_pen.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_236_zoom_in.png Binary file timeline/assets/glyphicons/png/glyphicons_236_zoom_in.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_237_zoom_out.png Binary file timeline/assets/glyphicons/png/glyphicons_237_zoom_out.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_238_pin.png Binary file timeline/assets/glyphicons/png/glyphicons_238_pin.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_239_riflescope.png Binary file timeline/assets/glyphicons/png/glyphicons_239_riflescope.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_240_rotation_lock.png Binary file timeline/assets/glyphicons/png/glyphicons_240_rotation_lock.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_241_flash.png Binary file timeline/assets/glyphicons/png/glyphicons_241_flash.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_242_google_maps.png Binary file timeline/assets/glyphicons/png/glyphicons_242_google_maps.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_243_anchor.png Binary file timeline/assets/glyphicons/png/glyphicons_243_anchor.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_244_conversation.png Binary file timeline/assets/glyphicons/png/glyphicons_244_conversation.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_245_chat.png Binary file timeline/assets/glyphicons/png/glyphicons_245_chat.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_246_male.png Binary file timeline/assets/glyphicons/png/glyphicons_246_male.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_247_female.png Binary file timeline/assets/glyphicons/png/glyphicons_247_female.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_248_asterisk.png Binary file timeline/assets/glyphicons/png/glyphicons_248_asterisk.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_249_divide.png Binary file timeline/assets/glyphicons/png/glyphicons_249_divide.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_250_snorkel_diving.png Binary file timeline/assets/glyphicons/png/glyphicons_250_snorkel_diving.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_251_scuba_diving.png Binary file timeline/assets/glyphicons/png/glyphicons_251_scuba_diving.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_252_oxygen_bottle.png Binary file timeline/assets/glyphicons/png/glyphicons_252_oxygen_bottle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_253_fins.png Binary file timeline/assets/glyphicons/png/glyphicons_253_fins.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_254_fishes.png Binary file timeline/assets/glyphicons/png/glyphicons_254_fishes.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_255_boat.png Binary file timeline/assets/glyphicons/png/glyphicons_255_boat.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_256_delete_point.png Binary file timeline/assets/glyphicons/png/glyphicons_256_delete_point.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_257_sheriffs_-star.png Binary file timeline/assets/glyphicons/png/glyphicons_257_sheriffs_-star.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_258_qrcode.png Binary file timeline/assets/glyphicons/png/glyphicons_258_qrcode.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_259_barcode.png Binary file timeline/assets/glyphicons/png/glyphicons_259_barcode.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_260_pool.png Binary file timeline/assets/glyphicons/png/glyphicons_260_pool.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_261_buoy.png Binary file timeline/assets/glyphicons/png/glyphicons_261_buoy.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_262_spade.png Binary file timeline/assets/glyphicons/png/glyphicons_262_spade.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_263_bank.png Binary file timeline/assets/glyphicons/png/glyphicons_263_bank.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_264_vcard.png Binary file timeline/assets/glyphicons/png/glyphicons_264_vcard.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_265_electrical_plug.png Binary file timeline/assets/glyphicons/png/glyphicons_265_electrical_plug.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_266_flag.png Binary file timeline/assets/glyphicons/png/glyphicons_266_flag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_267_credit_card.png Binary file timeline/assets/glyphicons/png/glyphicons_267_credit_card.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_268_keyboard_wireless.png Binary file timeline/assets/glyphicons/png/glyphicons_268_keyboard_wireless.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_269_keyboard_wired.png Binary file timeline/assets/glyphicons/png/glyphicons_269_keyboard_wired.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_270_shield.png Binary file timeline/assets/glyphicons/png/glyphicons_270_shield.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_271_ring.png Binary file timeline/assets/glyphicons/png/glyphicons_271_ring.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_272_cake.png Binary file timeline/assets/glyphicons/png/glyphicons_272_cake.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_273_drink.png Binary file timeline/assets/glyphicons/png/glyphicons_273_drink.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_274_beer.png Binary file timeline/assets/glyphicons/png/glyphicons_274_beer.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_275_fast_food.png Binary file timeline/assets/glyphicons/png/glyphicons_275_fast_food.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_276_cutlery.png Binary file timeline/assets/glyphicons/png/glyphicons_276_cutlery.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_277_pizza.png Binary file timeline/assets/glyphicons/png/glyphicons_277_pizza.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_278_birthday_cake.png Binary file timeline/assets/glyphicons/png/glyphicons_278_birthday_cake.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_279_tablet.png Binary file timeline/assets/glyphicons/png/glyphicons_279_tablet.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_280_settings.png Binary file timeline/assets/glyphicons/png/glyphicons_280_settings.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_281_bullets.png Binary file timeline/assets/glyphicons/png/glyphicons_281_bullets.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_282_cardio.png Binary file timeline/assets/glyphicons/png/glyphicons_282_cardio.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_283_t-shirt.png Binary file timeline/assets/glyphicons/png/glyphicons_283_t-shirt.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_284_pants.png Binary file timeline/assets/glyphicons/png/glyphicons_284_pants.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_285_sweater.png Binary file timeline/assets/glyphicons/png/glyphicons_285_sweater.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_286_fabric.png Binary file timeline/assets/glyphicons/png/glyphicons_286_fabric.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_287_leather.png Binary file timeline/assets/glyphicons/png/glyphicons_287_leather.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_288_scissors.png Binary file timeline/assets/glyphicons/png/glyphicons_288_scissors.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_289_podium.png Binary file timeline/assets/glyphicons/png/glyphicons_289_podium.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_290_skull.png Binary file timeline/assets/glyphicons/png/glyphicons_290_skull.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_291_celebration.png Binary file timeline/assets/glyphicons/png/glyphicons_291_celebration.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_292_tea_kettle.png Binary file timeline/assets/glyphicons/png/glyphicons_292_tea_kettle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_293_french_press.png Binary file timeline/assets/glyphicons/png/glyphicons_293_french_press.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_294_coffe_cup.png Binary file timeline/assets/glyphicons/png/glyphicons_294_coffe_cup.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_295_pot.png Binary file timeline/assets/glyphicons/png/glyphicons_295_pot.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_296_grater.png Binary file timeline/assets/glyphicons/png/glyphicons_296_grater.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_297_kettle.png Binary file timeline/assets/glyphicons/png/glyphicons_297_kettle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_298_hospital.png Binary file timeline/assets/glyphicons/png/glyphicons_298_hospital.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_299_hospital_h.png Binary file timeline/assets/glyphicons/png/glyphicons_299_hospital_h.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_300_microphone.png Binary file timeline/assets/glyphicons/png/glyphicons_300_microphone.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_301_webcam.png Binary file timeline/assets/glyphicons/png/glyphicons_301_webcam.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_302_temple_christianity_church.png Binary file timeline/assets/glyphicons/png/glyphicons_302_temple_christianity_church.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_303_temple_islam.png Binary file timeline/assets/glyphicons/png/glyphicons_303_temple_islam.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_304_temple_hindu.png Binary file timeline/assets/glyphicons/png/glyphicons_304_temple_hindu.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_305_temple_buddhist.png Binary file timeline/assets/glyphicons/png/glyphicons_305_temple_buddhist.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_306_electrical_socket_eu.png Binary file timeline/assets/glyphicons/png/glyphicons_306_electrical_socket_eu.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_307_electrical_socket_us.png Binary file timeline/assets/glyphicons/png/glyphicons_307_electrical_socket_us.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_308_bomb.png Binary file timeline/assets/glyphicons/png/glyphicons_308_bomb.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_309_comments.png Binary file timeline/assets/glyphicons/png/glyphicons_309_comments.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_310_flower.png Binary file timeline/assets/glyphicons/png/glyphicons_310_flower.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_311_baseball.png Binary file timeline/assets/glyphicons/png/glyphicons_311_baseball.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_312_rugby.png Binary file timeline/assets/glyphicons/png/glyphicons_312_rugby.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_313_ax.png Binary file timeline/assets/glyphicons/png/glyphicons_313_ax.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_314_table_tennis.png Binary file timeline/assets/glyphicons/png/glyphicons_314_table_tennis.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_315_bowling.png Binary file timeline/assets/glyphicons/png/glyphicons_315_bowling.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_316_tree_conifer.png Binary file timeline/assets/glyphicons/png/glyphicons_316_tree_conifer.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_317_tree_deciduous.png Binary file timeline/assets/glyphicons/png/glyphicons_317_tree_deciduous.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_318_more-items.png Binary file timeline/assets/glyphicons/png/glyphicons_318_more-items.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_319_sort.png Binary file timeline/assets/glyphicons/png/glyphicons_319_sort.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_320_filter.png Binary file timeline/assets/glyphicons/png/glyphicons_320_filter.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_321_gamepad.png Binary file timeline/assets/glyphicons/png/glyphicons_321_gamepad.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_322_playing_dices.png Binary file timeline/assets/glyphicons/png/glyphicons_322_playing_dices.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_323_calculator.png Binary file timeline/assets/glyphicons/png/glyphicons_323_calculator.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_324_tie.png Binary file timeline/assets/glyphicons/png/glyphicons_324_tie.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_325_wallet.png Binary file timeline/assets/glyphicons/png/glyphicons_325_wallet.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_326_share.png Binary file timeline/assets/glyphicons/png/glyphicons_326_share.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_327_sampler.png Binary file timeline/assets/glyphicons/png/glyphicons_327_sampler.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_328_piano.png Binary file timeline/assets/glyphicons/png/glyphicons_328_piano.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_329_web_browser.png Binary file timeline/assets/glyphicons/png/glyphicons_329_web_browser.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_330_blog.png Binary file timeline/assets/glyphicons/png/glyphicons_330_blog.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_331_dashboard.png Binary file timeline/assets/glyphicons/png/glyphicons_331_dashboard.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_332_certificate.png Binary file timeline/assets/glyphicons/png/glyphicons_332_certificate.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_333_bell.png Binary file timeline/assets/glyphicons/png/glyphicons_333_bell.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_334_candle.png Binary file timeline/assets/glyphicons/png/glyphicons_334_candle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_335_pin_classic.png Binary file timeline/assets/glyphicons/png/glyphicons_335_pin_classic.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_336_iphone_shake.png Binary file timeline/assets/glyphicons/png/glyphicons_336_iphone_shake.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_337_pin_flag.png Binary file timeline/assets/glyphicons/png/glyphicons_337_pin_flag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_338_turtle.png Binary file timeline/assets/glyphicons/png/glyphicons_338_turtle.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_339_rabbit.png Binary file timeline/assets/glyphicons/png/glyphicons_339_rabbit.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_340_globe.png Binary file timeline/assets/glyphicons/png/glyphicons_340_globe.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_341_briefcase.png Binary file timeline/assets/glyphicons/png/glyphicons_341_briefcase.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_342_hdd.png Binary file timeline/assets/glyphicons/png/glyphicons_342_hdd.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_343_thumbs_up.png Binary file timeline/assets/glyphicons/png/glyphicons_343_thumbs_up.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_344_thumbs_down.png Binary file timeline/assets/glyphicons/png/glyphicons_344_thumbs_down.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_345_hand_right.png Binary file timeline/assets/glyphicons/png/glyphicons_345_hand_right.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_346_hand_left.png Binary file timeline/assets/glyphicons/png/glyphicons_346_hand_left.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_347_hand_up.png Binary file timeline/assets/glyphicons/png/glyphicons_347_hand_up.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_348_hand_down.png Binary file timeline/assets/glyphicons/png/glyphicons_348_hand_down.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_349_fullscreen.png Binary file timeline/assets/glyphicons/png/glyphicons_349_fullscreen.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_350_shopping_bag.png Binary file timeline/assets/glyphicons/png/glyphicons_350_shopping_bag.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_351_book_open.png Binary file timeline/assets/glyphicons/png/glyphicons_351_book_open.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_352_nameplate.png Binary file timeline/assets/glyphicons/png/glyphicons_352_nameplate.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_353_nameplate_alt.png Binary file timeline/assets/glyphicons/png/glyphicons_353_nameplate_alt.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_354_vases.png Binary file timeline/assets/glyphicons/png/glyphicons_354_vases.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_355_announcement.png Binary file timeline/assets/glyphicons/png/glyphicons_355_announcement.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_356_dumbbell.png Binary file timeline/assets/glyphicons/png/glyphicons_356_dumbbell.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_357_suitcase.png Binary file timeline/assets/glyphicons/png/glyphicons_357_suitcase.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_358_file_import.png Binary file timeline/assets/glyphicons/png/glyphicons_358_file_import.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_359_file_export.png Binary file timeline/assets/glyphicons/png/glyphicons_359_file_export.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_360_pinterest.png Binary file timeline/assets/glyphicons/png/glyphicons_360_pinterest.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_361_dropbox.png Binary file timeline/assets/glyphicons/png/glyphicons_361_dropbox.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_362_google+_alt.png Binary file timeline/assets/glyphicons/png/glyphicons_362_google+_alt.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_363_jolicloud.png Binary file timeline/assets/glyphicons/png/glyphicons_363_jolicloud.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_364_yahoo.png Binary file timeline/assets/glyphicons/png/glyphicons_364_yahoo.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_365_blogger.png Binary file timeline/assets/glyphicons/png/glyphicons_365_blogger.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_366_picasa.png Binary file timeline/assets/glyphicons/png/glyphicons_366_picasa.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_367_amazon.png Binary file timeline/assets/glyphicons/png/glyphicons_367_amazon.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_368_tumblr.png Binary file timeline/assets/glyphicons/png/glyphicons_368_tumblr.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_369_wordpress.png Binary file timeline/assets/glyphicons/png/glyphicons_369_wordpress.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_370_instapaper.png Binary file timeline/assets/glyphicons/png/glyphicons_370_instapaper.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_371_evernote.png Binary file timeline/assets/glyphicons/png/glyphicons_371_evernote.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_372_xing.png Binary file timeline/assets/glyphicons/png/glyphicons_372_xing.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_373_zootool.png Binary file timeline/assets/glyphicons/png/glyphicons_373_zootool.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_374_dribbble.png Binary file timeline/assets/glyphicons/png/glyphicons_374_dribbble.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_375_deviantart.png Binary file timeline/assets/glyphicons/png/glyphicons_375_deviantart.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_376_read_it_later.png Binary file timeline/assets/glyphicons/png/glyphicons_376_read_it_later.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_377_linked_in.png Binary file timeline/assets/glyphicons/png/glyphicons_377_linked_in.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_378_forrst.png Binary file timeline/assets/glyphicons/png/glyphicons_378_forrst.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_379_pinboard.png Binary file timeline/assets/glyphicons/png/glyphicons_379_pinboard.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_380_behance.png Binary file timeline/assets/glyphicons/png/glyphicons_380_behance.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_381_github.png Binary file timeline/assets/glyphicons/png/glyphicons_381_github.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_382_youtube.png Binary file timeline/assets/glyphicons/png/glyphicons_382_youtube.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_383_skitch.png Binary file timeline/assets/glyphicons/png/glyphicons_383_skitch.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_384_4square.png Binary file timeline/assets/glyphicons/png/glyphicons_384_4square.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_385_quora.png Binary file timeline/assets/glyphicons/png/glyphicons_385_quora.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_386_google_plus.png Binary file timeline/assets/glyphicons/png/glyphicons_386_google_plus.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_387_spootify.png Binary file timeline/assets/glyphicons/png/glyphicons_387_spootify.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_388_stumbleupon.png Binary file timeline/assets/glyphicons/png/glyphicons_388_stumbleupon.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_389_readability.png Binary file timeline/assets/glyphicons/png/glyphicons_389_readability.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_390_facebook.png Binary file timeline/assets/glyphicons/png/glyphicons_390_facebook.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_391_twitter_t.png Binary file timeline/assets/glyphicons/png/glyphicons_391_twitter_t.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_392_twitter.png Binary file timeline/assets/glyphicons/png/glyphicons_392_twitter.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_393_buzz.png Binary file timeline/assets/glyphicons/png/glyphicons_393_buzz.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_394_vimeo.png Binary file timeline/assets/glyphicons/png/glyphicons_394_vimeo.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_395_flickr.png Binary file timeline/assets/glyphicons/png/glyphicons_395_flickr.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_396_last_fm.png Binary file timeline/assets/glyphicons/png/glyphicons_396_last_fm.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_397_rss.png Binary file timeline/assets/glyphicons/png/glyphicons_397_rss.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_398_skype.png Binary file timeline/assets/glyphicons/png/glyphicons_398_skype.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/glyphicons/png/glyphicons_399_e-mail.png Binary file timeline/assets/glyphicons/png/glyphicons_399_e-mail.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/sprites.psd Binary file timeline/assets/sprites.psd has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/assets/tooltip.psd Binary file timeline/assets/tooltip.psd has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/css/timeline.css --- a/timeline/css/timeline.css Tue May 22 14:55:44 2012 +0200 +++ b/timeline/css/timeline.css Wed May 23 18:16:27 2012 +0200 @@ -72,7 +72,7 @@ } .Tl-MainPart { - position: absolute; border-left: 1px solid #ccc; right: 0; top: 0; bottom: 0; background: rgba(255,255,255,.2); overflow: hidden; + position: absolute; right: 0; top: 0; bottom: 0; border-left: 1px solid #ccc; right: 0; top: 0; bottom: 0; overflow: hidden; } .Tl-UniversLabels { @@ -83,7 +83,7 @@ background: #e0e0e0; } -.Tl-Grid { +.Tl-Layer { position: absolute; top: 0; left: 50%; height: 100%; } @@ -102,3 +102,44 @@ .Tl-Grid-Now { position: absolute; top: 0; height: 100%; margin-left: -1px; width: 2px; background: #f000ff; } + +.Tl-Occurrence, .Tl-Cluster { + position: absolute; width: 19px; height: 22px; background: url(../img/sprites.png); margin-left: -9px; margin-top: -1px; cursor: pointer; +} + +.Tl-Occnarrative { + background-position: 0 -50px; +} + +.Tl-Occproduction { + background-position: -19px -50px; +} + +.Tl-Occboth { + background-position: -38px -50px; +} + +.Tl-ClusterCount { + position: absolute; right: 0; top: 0; border: 1px solid #999999; background: #333333; + padding: 1px 2px; font-size: 9px; color: #ffffff; border-radius: 5px; +} + +.Tl-Overlay-Container { + position: absolute; top: 0; +} + +.Tl-Overlay-Box { + position: absolute; width: 0; height: 0; display: none; +} + +.Tl-Overlay { + position: absolute; left: -105px; bottom: 0; width: 210px; +} + +.Tl-Overlay-Main { + width: 190px; padding: 10px 10px 0; background: url(../img/tooltip.png) top; +} + +.Tl-Overlay-Tip { + width: 210px; height: 20px; background: url(../img/tooltip.png) bottom; +} diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/data/occurrences.json --- a/timeline/data/occurrences.json Tue May 22 14:55:44 2012 +0200 +++ b/timeline/data/occurrences.json Wed May 23 18:16:27 2012 +0200 @@ -2,10 +2,10 @@ "occurrencesNarratives" : [ { "id" : "N01", - "date" : 1336608000000, + "date" : 1336606200000, "titre" : "Narrative 1", "description" : "Ma première occurrence narrative", - "univers" : "U02", + "univers" : "U06", "statut" : "valide", "publie" : true, "verrouille" : false, @@ -28,12 +28,14 @@ "Personnage A", "Personnage B" ], - "dependDe" : [] + "dependDe" : [ + "N01" + ] }, { "id" : "N03", "date" : 1336608180000, - "titre" : "Narrative 2", + "titre" : "Narrative 3", "description" : "Ma troisième occurrence narrative", "univers" : "U01", "statut" : "valide", @@ -44,6 +46,23 @@ "Personnage B" ], "dependDe" : [] + }, + { + "id" : "N04", + "date" : 1336608480000, + "titre" : "Narrative 4", + "description" : "Ma quatrième occurrence narrative", + "univers" : "U07", + "statut" : "valide", + "publie" : true, + "verrouille" : false, + "personnagesSecondaires": [ + "Personnage A", + "Personnage B" + ], + "dependDe" : [ + "N02" + ] } ], "occurrencesProduction" : [ @@ -52,7 +71,7 @@ "datePublication" : 1336608060000, "titre" : "Production 1", "description" : "Ma première occurrence de production", - "univers" : "U03", + "univers" : "U06", "statut" : "valide", "publie" : true, "verrouille" : false, @@ -69,7 +88,19 @@ "statut" : "valide", "publie" : true, "verrouille" : false, + "dependDe" : [] + }, + { + "id" : "P03", + "datePublication" : 1336608300000, + "titre" : "Production 3", + "description" : "Ma troisième occurrence de production", + "univers" : "U04", + "statut" : "valide", + "publie" : true, + "verrouille" : false, "dependDe" : [ + "N01", "N03" ] } diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/img/sprites.png Binary file timeline/img/sprites.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/img/tooltip.png Binary file timeline/img/tooltip.png has changed diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/js/timeline.js --- a/timeline/js/timeline.js Tue May 22 14:55:44 2012 +0200 +++ b/timeline/js/timeline.js Wed May 23 18:16:27 2012 +0200 @@ -104,7 +104,7 @@ end_date_format : '{{0hours}}:{{0minutes}}' }, { label : "1 Heure", - span : 80 * 60 * 1000, + span : 60 * 60 * 1000, grid_interval : 15 * 60 * 1000, grid_date_format : '{{0hours}}:{{0minutes}}', start_date_format : '{{dayOfMonth}} {{shortMonthName}} {{0hours}}:{{0minutes}}', @@ -114,7 +114,8 @@ central_time: 0, sync_now: true, url_occurrences: '', - occurrences: {} + occurrences: [], + cluster_spacing: 9 } for (var _i = 0; _i < Tlns.Defaults.Timeline.timescales.length; _i++) { @@ -127,9 +128,12 @@ + '
--/--
' + '
' + '
{{#timescales}}
{{label}}
{{/timescales}}
' - + '
'; + + '
' + + '
'; -Tlns.Templates.Univers = '{{title}}' +Tlns.Templates.Univers = '{{title}}'; + +Tlns.Templates.Occurrence = '{{#clusters}}
{{occurrences.length}}
{{/clusters}}{{#occurrences}}
{{/occurrences}}'; /* Classes */ @@ -150,6 +154,7 @@ this.main_height = this.height - this.$.find('.Tl-TopBar').outerHeight(); this.$.find('.Tl-BottomPart').css("height", this.main_height + "px"); this.$.find('.Tl-MainPart').css("width", this.main_width + "px"); + this.$.find('.Tl-Overlay-Container').css("left", Math.floor(this.$.find('.Tl-BottomPart').outerWidth() - this.main_width / 2) + "px"); var _o = this.$.find('.Tl-MainPart').offset(); this.dragging_bounds = { left: _o.left, @@ -193,6 +198,12 @@ return false; }); + this.$.find('.Tl-Overlay-Box').mouseover(function(_event) { + $(this).show(); + }).mouseout(function(_event) { + $(this).hide(); + }) + this.throttledSetTime = _.throttle(function(_time) { _this.setTime(_time) }, 150); @@ -206,36 +217,34 @@ Tlns.Classes.Timeline.prototype.onMouseDown = function(_event) { this.mouse_down = true; this.is_dragging = false; + this.time_at_start = this.central_time; this.start_pos = { x: _event.pageX, y: _event.pageY }; - var _target = $(_event.target); - while (!_target.hasClass("Tl-Main") && _target.length) { - if (_target.hasClass("Tl-MainPart")) { - this.dragging_type = "timeline"; - this.time_at_start = this.central_time; - break; - } - _target = _target.parent(); + if (typeof this.dragging_type === "undefined") { + this.dragging_type = "timeline"; } } Tlns.Classes.Timeline.prototype.onMouseUp = function(_event) { this.mouse_down = false; this.is_dragging = false; + this.dragging_type = undefined; } Tlns.Classes.Timeline.prototype.onMouseMove = function(_event) { if (this.mouse_down) { this.is_dragging = true; + this.$.find('.Tl-Overlay-Box').hide(); if (_event.pageX > this.dragging_bounds.left && _event.pageX < this.dragging_bounds.right && _event.pageY > this.dragging_bounds.top - && _event.pageY < this.dragging_bounds.bottom) { + && _event.pageY < this.dragging_bounds.bottom + ) { + var _newTime = Math.floor(this.time_at_start + ( this.start_pos.x - _event.pageX ) / this.current_scale); switch (this.dragging_type) { case "timeline": - var _newTime = Math.floor(this.time_at_start + ( this.start_pos.x - _event.pageX ) / this.current_scale); this.throttledSetTime(_newTime); break; } @@ -253,6 +262,7 @@ for(var _i = 0; _i < _data.length; _i++) { this.univers.push(new Tlns.Classes.Univers(_data[_i], this, _i)); } + this.loadOccurrences(); } Tlns.Classes.Timeline.prototype.offsetTime = function(_timeOffset) { @@ -290,14 +300,14 @@ } var _timescale = this.timescales[this.level], _offset = new Date().getTimezoneOffset() * 60000; - this.current_scale = this.main_width / (_timescale.span); - var _tmin = this.central_time - (_timescale.span / 2), - _tmax = this.central_time + (_timescale.span / 2), - _grid_width = Math.floor(_timescale.grid_interval * this.current_scale), - _roundstart = Math.floor((_tmin - _offset) / _timescale.grid_interval) * _timescale.grid_interval + _offset, + this.current_scale = this.main_width / (_timescale.span) + this.start_time = this.central_time - (_timescale.span / 2); + this.end_time = this.central_time + (_timescale.span / 2); + var _grid_width = Math.floor(_timescale.grid_interval * this.current_scale), + _roundstart = Math.floor((this.start_time - _offset) / _timescale.grid_interval) * _timescale.grid_interval + _offset, _html = ''; - this.$.find('.Tl-TopBar-TimeSpan').html(Tlns.Utils.dateFormat(_tmin, _timescale.start_date_format) + ' - ' + Tlns.Utils.dateFormat(_tmax, _timescale.end_date_format)); - for (var _t = _roundstart; _t < _tmax; _t += _timescale.grid_interval) { + this.$.find('.Tl-TopBar-TimeSpan').html(Tlns.Utils.dateFormat(this.start_time, _timescale.start_date_format) + ' - ' + Tlns.Utils.dateFormat(this.end_time, _timescale.end_date_format)); + for (var _t = _roundstart; _t < this.end_time; _t += _timescale.grid_interval) { _html += '
' + '
' + Tlns.Utils.dateFormat(_t, _timescale.grid_date_format) + '
'; } @@ -309,26 +319,165 @@ + ( _isMajor ? '
' + Tlns.Utils.dateFormat(_t, _timescale.date_format) + '
' : '' ) + ''; } */ - if (_tmin <= _now && _tmax >= _now) { + if (this.start_time <= _now && this.end_time >= _now) { _html += '
' } this.$.find('.Tl-Grid').html(_html); + this.drawOccurrences(); +} + +Tlns.Classes.Timeline.prototype.loadOccurrences = function() { + var _url = Mustache.to_html(this.url_occurrences, { + from_time: this.start_time, + to_time: this.end_time + }), + _this = this; + $.getJSON(_url, function(_data) { + _this.onOccurrencesLoaded(_data); + }); +} + +Tlns.Classes.Timeline.prototype.onOccurrencesLoaded = function(_data) { + if (typeof _data.occurrencesNarratives === "object" && _data.occurrencesNarratives !== null) { + for (var _i = 0; _i < _data.occurrencesNarratives.length; _i++) { + this.createOrUpdateOccurrence("narrative", _data.occurrencesNarratives[_i]); + } + for (var _i = 0; _i < _data.occurrencesProduction.length; _i++) { + this.createOrUpdateOccurrence("production", _data.occurrencesProduction[_i]); + } + } + if (!this.mouse_down) { + this.drawOccurrences(); + } +} + +Tlns.Classes.Timeline.prototype.getOccurrence = function(_type, _id) { + return _(this.occurrences).find(function(_occ) { + return (_occ.type == _type && _occ.id == _id); + }); +} + +Tlns.Classes.Timeline.prototype.createOrUpdateOccurrence = function(_type, _data) { + var _occurrence = this.getOccurrence(_type, _data.id); + if (typeof _occurrence === "undefined") { + _occurrence = new Tlns.Classes.Occurrence(this); + this.occurrences.push(_occurrence); + } + _occurrence.update(_type, _data); +} + +Tlns.Classes.Timeline.prototype.showTooltip = function(_x, _y, _html) { + this.$.find('.Tl-Overlay-Box').show() + .css({ + left: _x + "px", + top: _y + "px" + }); + this.$.find('.Tl-Overlay-Main').html(_html); +} + +Tlns.Classes.Timeline.prototype.hideTooltip = function() { + this.$.find('.Tl-Overlay-Box').hide(); } Tlns.Classes.Timeline.prototype.drawOccurrences = function() { + var _this = this, + _visible = _(this.occurrences).filter(function(_occ) { + return (_occ.date >= _this.start_time && _occ.date <= _this.end_time && _occ.published); + }); + _(_visible).each(function(_occ) { + _occ.x = _this.current_scale * (_occ.date - _this.central_time); + _occ.in_cluster = false; + }); + var _moved = true; + while (_moved) { + _moved = false; + for (var _i = 0; _i < _visible.length; _i++) { + for (var _j = 0; _j < _i; _j++) { + if (_visible[_j].univers_id == _visible[_i].univers_id + && _visible[_j].x != _visible[_i].x + && Math.abs(_visible[_j].x-_visible[_i].x) < this.cluster_spacing + ) { + _moved = true; + _visible[_i].x = this.cluster_spacing * Math.round(_visible[_i].x / this.cluster_spacing); + _visible[_j].x = this.cluster_spacing * Math.round(_visible[_j].x / this.cluster_spacing); + } + } + } + } + var _clusters = []; + for (var _i = 0; _i < _visible.length; _i++) { + for (var _j = 0; _j < _i; _j++) { + if (_visible[_j].univers_id == _visible[_i].univers_id && _visible[_j].x == _visible[_i].x) { + _visible[_j].in_cluster = true; + _visible[_i].in_cluster = true; + var _x = _visible[_j].x, + _y = _visible[_j].univers.y; + _cluster = _(_clusters).find(function(_c) { return _c.x == _x && _c.y == _y }); + if (typeof _cluster === "undefined") { + _cluster = { x: _x, y: _y, occurrences: [] }; + _clusters.push(_cluster); + } + if ("undefined" === typeof _(_cluster.occurrences).find(function(_o) { + return _o.type == _visible[_j].type && _o.id == _visible[_j].id; + })) { + _cluster.occurrences.push({type: _visible[_j].type, id: _visible[_j].id}); + } + if ("undefined" === typeof _(_cluster.occurrences).find(function(_o) { + return _o.type == _visible[_i].type && _o.id == _visible[_i].id; + })) { + _cluster.occurrences.push({type: _visible[_i].type, id: _visible[_i].id}); + } + } + } + } + _(_clusters).each(function(_cluster) { + _cluster.type = _cluster.occurrences[0].type; + for (var _i = 1; _i < _cluster.occurrences.length; _i++) { + if (_cluster.occurrences[_i].type !== _cluster.type) { + _cluster.type = "both"; + break; + } + } + }); + + var _html = Mustache.to_html(Tlns.Templates.Occurrence, { + occurrences:_(_visible).reject(function(_o) {return _o.in_cluster}), + clusters: _clusters + }); + this.$.find('.Tl-Occurrences').html(_html); + this.$.find('.Tl-Occurrence').mousedown(function() { + _this.dragging_type = "occurrence" + }).mouseover(function() { + var _el = $(this), + _occurrence = _this.getOccurrence(_el.attr("occurrence-type"),_el.attr("occurrence-id")); + _this.showTooltip(_occurrence.x, _occurrence.univers.y, _occurrence.title); + }).mouseout(function() { + _this.hideTooltip(); + }); } +Tlns.Classes.Timeline.prototype.getUnivers = function(_id) { + return _(this.univers).find(function(_univ) { + return (_univ.id == _id); + }); +} + +/* + * Univers + */ + Tlns.Classes.Univers = function(_data, _timeline, _index) { this.id = _data.id; this.index = _index; this.title = _data.nom; this.mainCharacter = _data.personnage; + this.y = (_timeline.univers_height * _index); this.$label = $('
  • ').css({ height : _timeline.univers_height + "px" }).html(Mustache.to_html(Tlns.Templates.Univers, this)) - .addClass((_index % 2) ? 'Tl-Line-Odd' : 'Tl-Line-Even'); + .addClass((_index % 2) ? 'Tl-Line-Odd' : 'Tl-Line-Even'); _timeline.$.find('.Tl-UniversLabels').append(this.$label); var _txt = _data.nom, @@ -339,3 +488,29 @@ _span.html(_txt + '…'); } } + +/* + * Occurrence + */ + +Tlns.Classes.Occurrence = function(_timeline) { + this.timeline = _timeline; +} + +Tlns.Classes.Occurrence.prototype.update = function(_type, _data) { + this.type = _type; + this.id = _data.id || _.uniqueId(); + this.date = _data.date || _data.datePublication; + this.title = _data.titre || ""; + this.univers_id = _data.univers; + this.univers = this.timeline.getUnivers(this.univers_id); + this.status = _data.statut; + this.published = _data.publie || false; + this.locked = _data.verrouille || false; + this.characters = _data.personnagesSecondaires || []; + this.dependsOn = _data.dependDe || []; +} + +Tlns.Classes.Occurrence.prototype.toString = function() { + return "Occurrence " + this.type + ': "' + this.title + '"'; +} diff -r 03bbfd9cd3c6 -r 37492d1ce841 timeline/timeline.html --- a/timeline/timeline.html Tue May 22 14:55:44 2012 +0200 +++ b/timeline/timeline.html Wed May 23 18:16:27 2012 +0200 @@ -17,22 +17,12 @@ $(function() { _tl = new Tlns.Classes.Timeline({ url_univers: 'data/univers.json', + url_occurrences: 'data/occurrences.json', container: "timeline", level: 2, sync_now: false, central_time: Date.parse("2012-05-10T00:00:00Z") }); - -/* for (var i = 0; i < Tlns.Defaults.Timeline.timescales.length; i++) { - var _id = "timeline_" + i; - $("body").append($('
    ').attr("id",_id)); - new Tlns.Classes.Timeline({ - url_univers: 'data/univers.json', - container: _id, - level: i - }); - $("body").append($('
    ').css("height","10px")); - }*/ });