Browse files

last luna changes

  • Loading branch information...
1 parent a22bfac commit b9e9ab1a3eca82004832513aea6dc9f755645033 @timeglider committed Sep 10, 2012
Showing with 361 additions and 193 deletions.
  1. +18 −6 js/timeglider/TG_Date.js
  2. +85 −3 js/timeglider/TG_Mediator.js
  3. +29 −13 js/timeglider/TG_Org.js
  4. +14 −5 js/timeglider/TG_Timeline.js
  5. +155 −104 js/timeglider/TG_TimelineView.js
  6. +55 −52 js/timeglider/Timeglider.css
  7. BIN js/timeglider/buttons/corner-pointer.png
  8. BIN js/timeglider/buttons/dummies.png
  9. BIN js/timeglider/buttons/filter.psd
  10. BIN js/timeglider/buttons/footer_bg.png
  11. BIN js/timeglider/buttons/list2.png
  12. BIN js/timeglider/buttons/pan_left.png
  13. BIN js/timeglider/buttons/pan_right.png
  14. BIN js/timeglider/icons/circle_black.png
  15. BIN js/timeglider/icons/circle_yellow.png
  16. BIN js/timeglider/icons/flag_yellow.png
  17. BIN js/timeglider/icons/flask.png
  18. BIN js/timeglider/icons/goldstar.png
  19. BIN js/timeglider/icons/halfcircle_yellow.png
  20. BIN js/timeglider/icons/plus_yellow.png
  21. BIN js/timeglider/icons/quote.png
  22. BIN js/timeglider/icons/report.png
  23. +1 −0 js/timeglider/icons/shapes/_notes/dwsync.xml
  24. BIN js/timeglider/icons/shapes/circle_black.png
  25. 0 js/timeglider/icons/{ → shapes}/circle_blue.png
  26. 0 js/timeglider/icons/{ → shapes}/circle_gray.png
  27. 0 js/timeglider/icons/{ → shapes}/circle_green.png
  28. 0 js/timeglider/icons/{ → shapes}/circle_orange.png
  29. 0 js/timeglider/icons/{ → shapes}/circle_purple.png
  30. 0 js/timeglider/icons/{ → shapes}/circle_red.png
  31. BIN js/timeglider/icons/shapes/circle_white.png
  32. BIN js/timeglider/icons/shapes/circle_yellow.png
  33. 0 js/timeglider/icons/{ → shapes}/flag_black.png
  34. 0 js/timeglider/icons/{ → shapes}/flag_blue.png
  35. 0 js/timeglider/icons/{ → shapes}/flag_gray.png
  36. 0 js/timeglider/icons/{ → shapes}/flag_green.png
  37. 0 js/timeglider/icons/{ → shapes}/flag_orange.png
  38. 0 js/timeglider/icons/{ → shapes}/flag_purple.png
  39. 0 js/timeglider/icons/{ → shapes}/flag_red.png
  40. BIN js/timeglider/icons/shapes/flag_white.png
  41. BIN js/timeglider/icons/shapes/flag_yellow.png
  42. 0 js/timeglider/icons/{ → shapes}/halfcircle_black.png
  43. 0 js/timeglider/icons/{ → shapes}/halfcircle_blue.png
  44. 0 js/timeglider/icons/{ → shapes}/halfcircle_gray.png
  45. 0 js/timeglider/icons/{ → shapes}/halfcircle_green.png
  46. 0 js/timeglider/icons/{ → shapes}/halfcircle_orange.png
  47. 0 js/timeglider/icons/{ → shapes}/halfcircle_purple.png
  48. 0 js/timeglider/icons/{ → shapes}/halfcircle_red.png
  49. BIN js/timeglider/icons/shapes/halfcircle_white.png
  50. BIN js/timeglider/icons/shapes/halfcircle_yellow.png
  51. BIN js/timeglider/icons/shapes/inf_black.png
  52. BIN js/timeglider/icons/shapes/inf_blue.png
  53. BIN js/timeglider/icons/shapes/inf_gray.png
  54. BIN js/timeglider/icons/shapes/inf_green.png
  55. BIN js/timeglider/icons/shapes/inf_orange.png
  56. BIN js/timeglider/icons/shapes/inf_purple.png
  57. BIN js/timeglider/icons/shapes/inf_red.png
  58. BIN js/timeglider/icons/shapes/inf_white.png
  59. BIN js/timeglider/icons/shapes/inf_yellow.png
  60. BIN js/timeglider/icons/shapes/music_black.png
  61. BIN js/timeglider/icons/shapes/music_blue.png
  62. BIN js/timeglider/icons/shapes/music_gray.png
  63. BIN js/timeglider/icons/shapes/music_green.png
  64. BIN js/timeglider/icons/shapes/music_orange.png
  65. BIN js/timeglider/icons/shapes/music_purple.png
  66. BIN js/timeglider/icons/shapes/music_red.png
  67. BIN js/timeglider/icons/shapes/music_white.png
  68. BIN js/timeglider/icons/shapes/music_yellow.png
  69. 0 js/timeglider/icons/{ → shapes}/plus_black.png
  70. 0 js/timeglider/icons/{ → shapes}/plus_blue.png
  71. 0 js/timeglider/icons/{ → shapes}/plus_gray.png
  72. 0 js/timeglider/icons/{ → shapes}/plus_green.png
  73. 0 js/timeglider/icons/{ → shapes}/plus_orange.png
  74. 0 js/timeglider/icons/{ → shapes}/plus_purple.png
  75. 0 js/timeglider/icons/{ → shapes}/plus_red.png
  76. BIN js/timeglider/icons/shapes/plus_white.png
  77. BIN js/timeglider/icons/shapes/plus_yellow.png
  78. +1 −0 js/timeglider/icons/shapes/process copy/_notes/dwsync.xml
  79. BIN js/timeglider/icons/shapes/process copy/check_COLOR.png
  80. BIN js/timeglider/icons/shapes/process copy/clover_COLOR.png
  81. BIN js/timeglider/icons/shapes/process copy/gear_COLOR.png
  82. BIN js/timeglider/icons/shapes/process copy/heart_COLOR.png
  83. BIN js/timeglider/icons/shapes/process copy/lightning_COLOR.png
  84. BIN js/timeglider/icons/shapes/process copy/moon_COLOR.png
  85. BIN js/timeglider/icons/shapes/process copy/target_COLOR.png
  86. BIN js/timeglider/icons/shapes/process copy/warning_COLOR.png
  87. +1 −0 js/timeglider/icons/shapes/process/_notes/dwsync.xml
  88. BIN js/timeglider/icons/shapes/process/check_COLOR.png
  89. BIN js/timeglider/icons/shapes/process/clover_COLOR.png
  90. BIN js/timeglider/icons/shapes/process/gear_COLOR.png
  91. BIN js/timeglider/icons/shapes/process/heart_COLOR.png
  92. BIN js/timeglider/icons/shapes/process/lightning_COLOR.png
  93. BIN js/timeglider/icons/shapes/process/moon_COLOR.png
  94. BIN js/timeglider/icons/shapes/process/target_COLOR.png
  95. BIN js/timeglider/icons/shapes/process/warning_COLOR.png
  96. BIN js/timeglider/icons/shapes/process_done/.DS_Store
  97. 0 js/timeglider/icons/{ → shapes}/square_black.png
  98. 0 js/timeglider/icons/{ → shapes}/square_blue.png
  99. 0 js/timeglider/icons/{ → shapes}/square_gray.png
  100. 0 js/timeglider/icons/{ → shapes}/square_green.png
  101. 0 js/timeglider/icons/{ → shapes}/square_orange.png
  102. 0 js/timeglider/icons/{ → shapes}/square_purple.png
  103. 0 js/timeglider/icons/{ → shapes}/square_red.png
  104. BIN js/timeglider/icons/shapes/square_white.png
  105. BIN js/timeglider/icons/shapes/square_yellow.png
  106. 0 js/timeglider/icons/{ → shapes}/star_black.png
  107. 0 js/timeglider/icons/{ → shapes}/star_blue.png
  108. 0 js/timeglider/icons/{ → shapes}/star_gray.png
  109. 0 js/timeglider/icons/{ → shapes}/star_green.png
  110. 0 js/timeglider/icons/{ → shapes}/star_orange.png
  111. 0 js/timeglider/icons/{ → shapes}/star_purple.png
  112. 0 js/timeglider/icons/{ → shapes}/star_red.png
  113. BIN js/timeglider/icons/shapes/star_white.png
  114. BIN js/timeglider/icons/shapes/star_yellow.png
  115. BIN js/timeglider/icons/shapes/sym_card_club.png
  116. BIN js/timeglider/icons/shapes/sym_card_diamond.png
  117. BIN js/timeglider/icons/shapes/sym_card_heart.png
  118. BIN js/timeglider/icons/shapes/sym_card_spade.png
  119. BIN js/timeglider/icons/shapes/sym_file.png
  120. BIN js/timeglider/icons/shapes/sym_goldstar.png
  121. BIN js/timeglider/icons/shapes/sym_location.png
  122. BIN js/timeglider/icons/shapes/sym_question.png
  123. BIN js/timeglider/icons/shapes/sym_warning.png
  124. 0 js/timeglider/icons/{ → shapes}/triangle_black.png
  125. 0 js/timeglider/icons/{ → shapes}/triangle_blue.png
  126. 0 js/timeglider/icons/{ → shapes}/triangle_gray.png
  127. 0 js/timeglider/icons/{ → shapes}/triangle_green.png
  128. 0 js/timeglider/icons/{ → shapes}/triangle_orange.png
  129. 0 js/timeglider/icons/{ → shapes}/triangle_purple.png
  130. 0 js/timeglider/icons/{ → shapes}/triangle_red.png
  131. BIN js/timeglider/icons/shapes/triangle_white.png
  132. BIN js/timeglider/icons/shapes/triangle_yellow.png
  133. BIN js/timeglider/icons/square_yellow.png
  134. BIN js/timeglider/icons/triangle_yellow.png
  135. BIN js/timeglider/icons/video.png
  136. +0 −1 js/timeglider/img/_notes/dwsync.xml
  137. 0 js/timeglider/{buttons → img}/close.png
  138. 0 js/timeglider/{buttons → img}/close_small.png
  139. BIN js/timeglider/img/expcol_tan4.png
  140. 0 js/timeglider/{buttons → img}/filter.png
  141. BIN js/timeglider/img/icon_expcol.png
  142. BIN js/timeglider/img/icon_info.png
  143. BIN js/timeglider/img/icon_invert.png
  144. BIN js/timeglider/img/icon_legend.png
  145. BIN js/timeglider/img/info_tan4.png
  146. BIN js/timeglider/img/invert_tan4.png
  147. BIN js/timeglider/img/legend_tan4.png
  148. 0 js/timeglider/{buttons → img}/list.png
  149. BIN js/timeglider/img/modal_corner_north.png
  150. BIN js/timeglider/img/pan_left.png
  151. BIN js/timeglider/img/pan_right.png
  152. BIN js/timeglider/img/subtick_highlight.png
  153. 0 js/timeglider/{buttons → img}/tools.png
  154. +2 −9 methods.html
View
24 js/timeglider/TG_Date.js
@@ -11,7 +11,7 @@
// initial declaration of timeglider object for widget
// authoring app will declare a different object, so
// this will defer to window.timeglider
-timeglider = window.timeglider || {mode:"basic", version:"0.1.0"};
+timeglider = window.timeglider || {mode:"publish", version:"0.1.0"};
@@ -674,11 +674,23 @@ timeglider.TG_Date = {};
if (this.ye > -270000){
- fromUTC = TG_Date.toFromUTC(_.clone(this), offset, "from");
-
- jsDate = new Date(fromUTC.ye, (fromUTC.mo-1), fromUTC.da, fromUTC.ho, fromUTC.mi, fromUTC.se, 0);
-
- return $.global.format(jsDate, sig);
+ var cloner = _.clone(this);
+ fromUTC = TG_Date.toFromUTC(cloner, offset, "from");
+
+ var utcy = Number(fromUTC.ye);
+
+ if (utcy > 0 && utcy < 100) {
+ utcy = "0" + utcy;
+ // we can use the same thing we use for the BIGNUM problem
+ // below for this weird window that JS fails on
+ return TG_Date.monthNamesAbbr[fromUTC.mo] + " " + fromUTC.da + ", " + fromUTC.ye;
+
+ } else {
+ jsDate = new Date(utcy, (fromUTC.mo-1), fromUTC.da, fromUTC.ho, fromUTC.mi, fromUTC.se, 0);
+
+ return $.global.format(jsDate, sig);
+ }
+
} else {
View
88 js/timeglider/TG_Mediator.js
@@ -52,7 +52,7 @@ tg.TG_Mediator = function (wopts, $el) {
// setting this without setTimeoffset to avoid refresh();
this.timeOffset = TG_Date.getTimeOffset(options.timezone);
- this.base_font_size = 14;
+ this.base_font_size = 12;
this.fixed_zoom = (this.max_zoom == this.min_zoom) ? true : false;
this.gesturing = false;
@@ -71,6 +71,9 @@ tg.TG_Mediator = function (wopts, $el) {
this.imagesToSize = 0;
this.timelineDataLoaded = false,
+ this.image_lane_height = 0;
+
+
// this.setZoomLevel(options.initial_zoom);
this.initial_timelines = [];
this.initial_timeline_id = options.initial_timeline_id || "";
@@ -131,7 +134,21 @@ tg.TG_Mediator = function (wopts, $el) {
fObj[type] = content;
this.setFilters(fObj);
},
-
+
+
+ setImageLaneHeight: function(new_height, ref, set_ui) {
+ this.image_lane_height = new_height;
+
+ if (set_ui) {
+ $.publish(container_name + ".mediator.imageLaneHeightSetUi");
+ }
+
+ if (ref) {
+ this.refresh();
+ }
+
+
+ },
/* PUBLIC METHODS MEDIATED BY $.widget front */
@@ -169,6 +186,53 @@ tg.TG_Mediator = function (wopts, $el) {
},
+
+ loadPresentation: function(presentation_object) {
+
+ var me = this,
+ po = presentation_object,
+ tls = po.timelines,
+ tid = "",
+ active = [],
+ inverted = 0,
+ bottom = 0,
+ display = "expanded",
+ real_tl = {};
+
+ if (po.timelines.length > 0) {
+
+ _.each(tls, function(tl) {
+ if (tl.open == 1) {
+ tid = tl.timeline_id;
+ active.push(tid);
+ bottom = tl.bottom || 30;
+ display = tl.display || "expanded";
+ inverted = tl.inverted || 0;
+
+ real_tl = me.timelineCollection.get(tid);
+ real_tl.set({"inverted":inverted, "display":display, "bottom":bottom});
+ }
+ });
+
+ me.setFocusDate(new tg.TG_Date(po.focus_date));
+ me.activeTimelines = active;
+ me.setZoomLevel(po.initial_zoom);
+
+ me.setImageLaneHeight(po.image_lane_height || 0, false, true);
+
+
+ me.refresh();
+
+
+
+ } else {
+ // WTF no timelines
+ alert("There are no timelines in this presentation...");
+ return false;
+ }
+ },
+
+
getScope : function () {
var zi = this.getZoomInfo(),
@@ -539,7 +603,25 @@ tg.TG_Mediator = function (wopts, $el) {
// FROM NEW JSON
$.getJSON(src, function (data) {
- M.parseTimelineData(data, callback);
+
+ if (data.error) {
+
+ if (data.password_required == 1) {
+
+ // set up a password field!
+ alert("This presentation requires a password. Here at Timeglider, we're rebuilding our presentation system. Come back soon!");
+
+ } else {
+ // some other kind of error
+ alert(data.error);
+ }
+
+
+ return false;
+ } else {
+ M.parseTimelineData(data, callback);
+ }
+
});
}// end [obj vs remote]
View
42 js/timeglider/TG_Org.js
@@ -24,7 +24,9 @@
var lev_ht = tg.levelHeight = 12,
// number of available levels for events
$ = jQuery,
- ceiling_padding = 30;
+ ceiling_padding = 30,
+ topdown_pad = 30,
+ bottomup_pad = -8;
/*
@@ -59,13 +61,11 @@
*
*/
this.addBlock = function (evob, tickScope) {
-
evob.right = evob.left + evob.width;
evob.bottom = evob.top + evob.height;
evob.tickScope = tickScope;
me.freshBlocks.push(evob);
me.blocks.push(evob);
-
};
@@ -139,15 +139,19 @@
img = '',
icon = '',
html = '',
- south_padding = 0,
+ top_or_bottom_padding_from_title = 0,
b = {},
blength = this.freshBlocks.length,
b_span_color = "",
title_adj = 0,
highest = 0,
img_scale = 100,
img_style = "",
- image_class = "lane";
+ css_class = "",
+ p_icon = "",
+ p_overf = "",
+ image_class = "lane",
+ polarity_cond = "";
for (var i=0; i<blength; i++) {
@@ -235,15 +239,25 @@
// note: divs that are higher have lower "top" values
// `ceiling` being set at 0 (event_overflow set to "scroll")
// may require/allow for event scrolling possibilities...
- if (ceiling && (me.pol == -1) && (Math.abs(b.top) > highest)) {
+
+ if (me.pol == -1) {
+ polarity_cond = (ceiling && (Math.abs(b.top) > highest));
+ } else {
+ polarity_cond = (ceiling && (Math.abs(b.top + 30) > highest));
+ }
+
+
+ if (polarity_cond){
- var p_icon = (b.icon) ? "<img src='" + icon_f + b.icon + "'>": "+";
+ p_overf = (me.pol == -1) ? "top:-" + (ceiling-10) + "px": "top:" + ceiling + "px"
+
+ var white_cir = "<img src='" + icon_f + "shapes/circle_white.png'>";
+ p_icon = (b.icon) ? "<img src='" + icon_f + b.icon + "'>": white_cir;
// + + + symbols in place of events just under ceiling
// if things are higher than the ceiling, show plus signs instead,
// and we'll zoom in with these.
- html += "<div id='" + b.id + "' class='timeglider-timeline-event tg-event-overflow' style='left:" + b.left +
- "px; top:-" + (ceiling -4) + "px'>" + p_icon + "</div>";
+ html += "<div id='" + b.id + "' class='timeglider-timeline-event tg-event-overflow' style='left:" + b.left + "px;" + p_overf + "'>" + p_icon + "</div>";
} else {
@@ -272,19 +286,21 @@
// pad inverted (polarity 1) events to exceed the height
// of the timeline title bar; pad "normal" top-up events
// to have some space between them and the title bar
- south_padding = (me.pol === 1) ? 24 : -8;
-
+ top_or_bottom_padding_from_title = (me.pol === 1) ?
+ topdown_pad : bottomup_pad;
+ // possible customized class
+ css_class = b.css_class || '';
// TODO: function for getting "standard" event shit
html += "<div class='timeglider-timeline-event "
- + b.css_class + " " + span_selector_class
+ + css_class + " " + span_selector_class
+ "' id='" + b.id + "' "
+ "style='width:" + b.width + "px;"
+ "height:" + b.height + "px;"
+ "left:" + b.left + "px;"
+ "opacity:" + b.opacity + ";"
- + "top:" + (b.top + south_padding) + "px;"
+ + "top:" + (b.top + top_or_bottom_padding_from_title) + "px;"
+ "font-size:" + b.fontsize + "px;'>"
+ icon + img + span_div
+ "<div class='timeglider-event-title' style='top:" + title_adj + "px'>"
View
19 js/timeglider/TG_Timeline.js
@@ -404,11 +404,20 @@
// replaced by date_display
ddisp = ev.date_display || ev.date_limit || "da";
}
-
-
-
-
+
ev.date_display = ddisp.toLowerCase().substr(0,2);
+
+ if (ev.link) {
+ if (typeof ev.link == "string" && ev.link.substr(0,4) == "http") {
+ // make an array
+ ev.link = [{"url":ev.link, "label":"link"}]
+ }
+ } else {
+ ev.link = "";
+ }
+
+ ev.date_display = ddisp.toLowerCase().substr(0,2);
+
// if a timezone offset is set on the timeline, adjust
// any events that do not have the timezone set on them
@@ -438,7 +447,7 @@
// haven't parsed the image/image_class business...
if (ev.image) {
-
+ debug.log("has image!");
if (ev.image.display_class != "inline") {
tdata.hasImageLane = true;
}
View
259 js/timeglider/TG_TimelineView.js
@@ -73,7 +73,8 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
this.titleBar = true;
this.singleTitleHeight = 0;
- this.setImageLaneHeight(options.image_lane_height);
+
+ MED.setImageLaneHeight(options.image_lane_height, false, true);
/* references specific to the instance (rather than timeglider) so
@@ -167,8 +168,8 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
+ "<div class='dateline'>{{html dateline}}</div>"
+ "<h4>${title}</h4>"
+ "<div class='tg-full_modal-body'>"
- + "<p>{{html image}}{{html description}}</p>"
- + "<div id='insert'></div>"
+ + "{{html image}}{{html description}}"
+ // + "<div id='insert'></div>"
+ "</div>"
+ "<div class='tg-full_modal-links'><ul>{{html links}}</ul></div>"
// end of modal
@@ -208,8 +209,9 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
legend_modal : $.template( null,
"<div class='timeglider-menu-modal tg-legend tg-display-none' id='${id}_legend'>"+
- "<div class='timeglider-menu-modal-content'><ul id='${id}'>{{html legend_list}}</ul>"+
"<div class='tg-close-button-small tg-legend-close'></div>"+
+ "<div class='timeglider-menu-modal-content'><ul id='${id}'>{{html legend_list}}</ul>"+
+
"<div class='tg-legend-all'>all</div>"+
"</div>"+
"</div>")
@@ -604,6 +606,14 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
// mediator takes care of focusing date
var ev = MED.focusedEvent;
});
+
+
+ $.subscribe(container_name + ".mediator.imageLaneHeightSetUi", function () {
+ me.setImageLaneHandle();
+
+ });
+
+
$.subscribe(container_name + ".mediator.zoomLevelChange", function () {
@@ -716,6 +726,7 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
me.buildSettingsMenu();
$(".timeglider-loading").fadeOut(500);
+
});
@@ -848,9 +859,7 @@ tg.TG_TimelinePlayer.prototype = {
ticks_ht = h-(f_height+t_height);
head_ht = $(".tg-widget-header").outerHeight();
-
- debug.log("head ht in gwd:", head_ht);
-
+
var container = {"width":w, "height":h, "centerx":wc, "centery":hc, "left": lft, "offset": offset},
ticks = {"height":ticks_ht},
tick = {"top":t_top, "height":t_height},
@@ -1114,6 +1123,7 @@ tg.TG_TimelinePlayer.prototype = {
+
/* FILTER BOX SETUP */
setupFilter : function () {
@@ -1129,8 +1139,6 @@ tg.TG_TimelinePlayer.prototype = {
}).css("z-index", me.ztop++).hide();
-
-
$(CONTAINER)
.delegate(".timeglider-filter-box .tg-close-button", "click", function () {
$filter.fadeOut();
@@ -1354,6 +1362,14 @@ tg.TG_TimelinePlayer.prototype = {
me.timelineModal(tid);
+
+
+ if (timeline.get("hasLegend")) {
+ setTimeout(function() {
+ me.legendModal(tid);
+ }, 500);
+ }
+
},
@@ -1434,9 +1450,6 @@ tg.TG_TimelinePlayer.prototype = {
// adjusts the zoom slider away from the timeline bar at top
$(me._views.SLIDER_CONTAINER).css("top", me.singleTitleHeight + 4);
- debug.log("start pres");
-
-
me.startPresentation();
if (pres.open_modal && pres.description) {
@@ -1453,37 +1466,47 @@ tg.TG_TimelinePlayer.prototype = {
$imageLane = $("<div class='tg-image-lane-pull'><div title='This is the image lane!' class='tg-image-lane-bg'></div></div>").appendTo(CONTAINER);
$imageLane.draggable({
+
axis:"y",
containment: "parent",
drag: function () {
var $pull = $(this);
var ypos = $pull.position().top;
- if (ypos > 175) {
- $pull.css("top", 175);
+ if (ypos > 400) {
+ $pull.css("top", 400);
return false;
} else if (ypos < 5) {
$pull.css("top", 5);
return false;
}
},
stop:function() {
- me.setImageLaneHeight($(this).position().top - me.singleTitleHeight, true);
+ MED.setImageLaneHeight($(this).position().top - me.singleTitleHeight, true, false);
}
});
me.setImageLaneHandle();
},
- setImageLaneHandle: function (ht) {
+
+
+ /*
+ * setImageLaneHandle
+ * gets image_lane_height from MED and sets image lane
+ * UI remotely (not from dragging, but from timeline/pres props)
+ */
+ setImageLaneHandle: function () {
+
var me = this;
- var newHt = parseInt(me.imageLaneHeight, 10) + parseInt(me.singleTitleHeight, 10);
+ var newHt = parseInt(MED.image_lane_height, 10) + parseInt(me.singleTitleHeight, 10);
$(".tg-image-lane-pull").css("top", newHt + "px");
},
+
/*
Zoom slider is inverted value-wise from the normal jQuery UI slider
so we need to feed in and take out inverse values with invSliderVal()
@@ -1578,39 +1601,40 @@ tg.TG_TimelinePlayer.prototype = {
eventHover : function ($ev, ev) {
if (typeof MED.options.eventHover == "function") {
+
MED.options.eventHover($ev, ev);
} else {
-
var me = this,
$hov = $(".timeglider-event-hover-info"),
- apnd = "";
-
- if (ev.date_display != "no") {
-
- if ($ev.hasClass("tg-event-collapsed") || $ev.hasClass("tg-event-overflow")) {
- // debug.log("it's collapsed...");
- apnd = "<div>" + ev.title + "</div>";
- } else {
- apnd = "";
- }
-
+ title = "",
+ date_line = "";
+
+ $ev.append("<div class='tg-event-hoverline'></div>").addClass("tg-event-hovered");
+
+ if (ev.date_display == "no") {
+ date_line = "";
+ } else {
+ date_line = me.getEventDateLine(ev);
+ }
+ if ($ev.hasClass("tg-event-collapsed") || $ev.hasClass("tg-event-overflow")) {
+ title = "<div>" + ev.title + "</div>";
+ } else {
+ title = "";
+ }
+
+ if (title || date_line) {
$hov.position({
my: "left top",
at: "left bottom",
of: $ev,
offset: "1, 4",
collision: "flip flip"}
)
- .html(me.getEventDateLine(ev))
- .append(apnd);
-
- }
-
- $ev.append("<div class='tg-event-hoverline'></div>").addClass("tg-event-hovered");
-
+ .html(title + date_line)
+ }
}
},
@@ -1660,29 +1684,34 @@ tg.TG_TimelinePlayer.prototype = {
var zLevel = MED.getZoomLevel(),
fDate = MED.getFocusDate(),
- tickWidth = MED.getZoomInfo().width,
+ zInfo = MED.getZoomInfo(),
+ tickWidth = zInfo.width,
twTotal = 0,
ctr = this.dimensions.container.centerx,
// determine how many are necessary to fill (overfill) container
nTicks = Math.ceil(this.dimensions.container.width / tickWidth) + 4,
leftright = 'l';
- MED.setTicksReady(false);
-
- // INITIAL TICK added in center according to focus date provided
+ if (typeof zInfo.width == "number") {
- this.addTick({"type":"init", "focus_date":fDate});
+ MED.setTicksReady(false);
+
+ // INITIAL TICK added in center according to focus date provided
+
+ this.addTick({"type":"init", "focus_date":fDate});
+
+ // ALTERNATING L & R ticks
+ for (var i=1; i<=nTicks; i +=1) {
+ this.addTick({"type":leftright});
+ // switch l and r for alternating layout action
+ leftright = (leftright == "l") ? "r" : "l";
+ }
+
+ MED.setTicksReady(true);
+
+ this.displayFocusDate();
- // ALTERNATING L & R ticks
- for (var i=1; i<=nTicks; i +=1) {
- this.addTick({"type":leftright});
- // switch l and r for alternating layout action
- leftright = (leftright == "l") ? "r" : "l";
}
-
- MED.setTicksReady(true);
-
- this.displayFocusDate();
},
@@ -1857,9 +1886,8 @@ tg.TG_TimelinePlayer.prototype = {
// In order to gather whether an outlier span is
// occuring on drag-right (the right side of a span)
- // we need some seconds...
-
-
+ // we need some seconds...
+
pack.seconds = this.getTickSeconds[tickUnit](pack.serial);
// DO OTHER STUFF TO THE TICK, MAKE THE LABEL AN ACTIONABLE ELEMENT
@@ -1897,9 +1925,7 @@ tg.TG_TimelinePlayer.prototype = {
} else {
$C.css({"display":"none"});
}
-
- debug.log("tick height:", th);
-
+
var ticks_ht = ch-(fh+th);
$(this._views.TICKS).css("height", ticks_ht);
@@ -2486,17 +2512,15 @@ tg.TG_TimelinePlayer.prototype = {
tlModel = MED.timelineCollection.get(active[a]);
tl = tlModel.attributes;
-
-
tl.visibleEvents = [];
expCol = tl.display;
// TODO establish the 120 below in some kind of constant!
// meanwhile: tl_top is the starting height of a loaded timeline
- tl_bottom = (tl.bottom) ? stripPx(tl.bottom) : 24;
- if (tl_bottom < 24) tl_bottom = 24;
+ tl_bottom = (tl.bottom) ? stripPx(tl.bottom) : 30;
+ if (tl_bottom < 30) tl_bottom = 30;
tl_top = ticks_ht - tl_bottom;
@@ -2627,15 +2651,23 @@ tg.TG_TimelinePlayer.prototype = {
} else {
//!TODO: does ANY timeline have an image lane??
+ if (tl.inverted) {
+ ceiling = tl_bottom - 16;
+
+
+ } else {
+ ceiling = (tl.hasImageLane || tg.mode == "authoring") ? (tl_top - MED.image_lane_height) - me.singleTitleHeight : tl_top - me.singleTitleHeight ;
+
+ }
- ceiling = (tl.hasImageLane || tg.mode == "authoring") ? (tl_top - me.imageLaneHeight) - me.singleTitleHeight : tl_top - me.singleTitleHeight ;
}
// var beforeStuff = +new Date();
var onIZoom = (tl.initial_zoom == MED.getZoomLevel());
+
if (expCol == "expanded") {
stuff = borg.getHTML({tickScope:"sweep", ceiling:ceiling, onIZoom:onIZoom, inverted:tl.inverted});
tl.borg = borg.getBorg();
@@ -2719,7 +2751,7 @@ tg.TG_TimelinePlayer.prototype = {
if (options.event_overflow == "scroll") {
ceiling = 0;
} else {
- ceiling = (tl.hasImageLane) ? (tl_top - me.imageLaneHeight) - me.singleTitleHeight : tl_top;
+ ceiling = (tl.hasImageLane) ? (tl_top - MED.image_lane_height) - me.singleTitleHeight : tl_top;
}
@@ -2728,7 +2760,7 @@ tg.TG_TimelinePlayer.prototype = {
// borg it if it's expanded.
if (tl.display == "expanded"){
// tl.top is the ceiling
- stuff = tl.borg.getHTML({tickScope:tick.serial, ceiling:ceiling, onIZoom:onIZoom});
+ stuff = tl.borg.getHTML({tickScope:tick.serial, ceiling:ceiling, onIZoom:onIZoom, inverted:tl.inverted});
}
var $vu = $(CONTAINER + " .tg-timeline-envelope#" + tl.id);
@@ -2778,15 +2810,16 @@ tg.TG_TimelinePlayer.prototype = {
buffer = 16,
img_ht = 0,
img_wi = 0,
- borg = tl.borg,
+ borg = tl.borg || "",
ev = {},
+ font_ht = 0,
shape = {},
colTop = 0,
impq,
block_arg = "sweep"; // default for initial load
- tl.borg.clearFresh();
+ if (borg) tl.borg.clearFresh();
var isBig = function(tu) {
@@ -2824,18 +2857,16 @@ tg.TG_TimelinePlayer.prototype = {
ev.width = (ev.titleWidth * impq) + buffer;
ev.fontsize = MED.base_font_size * impq;
ev.left = posx;
-
ev.spanwidth = 0;
- if (ev.span == true) {
-
+
+ if (ev.span == true) {
ev.spanwidth = ((ev.enddateObj.sec - ev.startdateObj.sec) / spp);
if (ev.spanwidth > ev.width) { ev.width = ev.spanwidth + buffer; }
-
}
img_ht = 0;
- var font_ht = Math.ceil(ev.fontsize);
+ font_ht = Math.ceil(ev.fontsize);
ev.height = (font_ht + 4);
ev.top = (ht - font_ht);
@@ -2879,9 +2910,12 @@ tg.TG_TimelinePlayer.prototype = {
} else {
colTop = ht - 20;
}
+
+ colIcon = (ev.icon) ? tg.icon_folder + ev.icon: tg.icon_folder + "shapes/circle_white.png";
+
stuff += "<div id='" + ev.id +
"' class='timeglider-timeline-event tg-event-collapsed' style='top:" +
- colTop + "px;left:" + posx + "px'><img src='" + tg.icon_folder + ev.icon + "'></div>";
+ colTop + "px;left:" + posx + "px'><img src='" + colIcon + "'></div>";
}
} // end if it passes filters
@@ -2897,13 +2931,6 @@ tg.TG_TimelinePlayer.prototype = {
},
-
- setImageLaneHeight: function(new_height, ref) {
- this.imageLaneHeight = new_height;
- if (ref) {
- MED.refresh();
- }
- },
/*
* registerEventImages
@@ -2915,9 +2942,9 @@ tg.TG_TimelinePlayer.prototype = {
*/
registerEventImages : function ($timeline) {
var me = this,
- laneHt = me.imageLaneHeight,
+ laneHt = MED.image_lane_height,
padding = 4,
- laneMax = 150,
+ laneMax = 400,
stht = this.singleTitleHeight;
if (laneHt > laneMax) { laneHt = laneMax; }
@@ -3049,6 +3076,8 @@ tg.TG_TimelinePlayer.prototype = {
* in the event's link_json array
*/
createEventLinksMenu : function (linkage) {
+
+
if (!linkage) return "";
var html = '', l = 0, lUrl = "", lLab="";
@@ -3082,9 +3111,10 @@ tg.TG_TimelinePlayer.prototype = {
ev = MED.eventCollection.get(eid).attributes,
// modal type: first check event, then timeline-wide option
- modal_type = ev.modal_type || options.event_modal.type,
-
- ev_img = (ev.image && ev.image.src) ? "<img src='" + ev.image.src + "'>" : "",
+ modal_type = ev.modal_type || options.event_modal.type;
+
+ var ev_img = (ev.image && ev.image.src) ? "<img src='" + ev.image.src + "'>" : "",
+
links = this.createEventLinksMenu(ev.link),
templ_obj = {
@@ -3109,13 +3139,12 @@ tg.TG_TimelinePlayer.prototype = {
} else if ((ev.description.length > 1200) || (me.dimensions.container.width < 500)) {
modal_type = "full";
}
-
-
+ // return false;
switch (modal_type) {
case "full":
-
+
$modal = $.tmpl(me._templates.event_modal_full,templ_obj);
// full modal with scrim, etc
var pad = 32;
@@ -3147,7 +3176,7 @@ tg.TG_TimelinePlayer.prototype = {
"left":"32px"
});
- var $pp = $panel.find("p");
+ var $pp = $panel.find("p")[0];
var pph = ph-120;
@@ -3195,9 +3224,10 @@ tg.TG_TimelinePlayer.prototype = {
} else if (video_view == true) {
- var $insert = $modal.find("p");
+ // var $insert = $modal.find("p");
+
- $vid = $("<div class='tg-modal-video'><iframe frameborder='0' src='" + ev.video + "'></iframe></div>").prependTo($pp);
+ $vid = $("<div class='tg-modal-video'><iframe frameborder='0' src='" + ev.video + "'></iframe></div>").prependTo(".tg-full_modal-body");
$vid.find("iframe").css("height", $vid.width() * .66)
@@ -3344,10 +3374,10 @@ tg.TG_TimelinePlayer.prototype = {
.css("z-index", me.ztop++)
.toggleClass("tg-display-none")
.position({
- my: "left top",
- at: "left top",
+ my: "right top",
+ at: "right top",
of: $(CONTAINER),
- offset: "16, 12", // left, top
+ offset: "-72, 32", // left, top
collision: "fit fit"
});
@@ -3432,39 +3462,55 @@ tg.TG_TimelineView = Backbone.View.extend({
getTemplate: function() {
- var tmpl = "";
- var inverted = this.model.get("inverted") ? " timeline-inverted": "";
+ var tmpl = "",
+ env_bts = "",
+ env_b = "",
+ inverted = "";
+
+
+ if (this.model.get("inverted")) {
+ inverted = " timeline-inverted";
+
+ } else {
+ inverted = "";
+ }
+
if (this.titleBar == "fullBar") {
+
tmpl = "<div class='titleBar'>"
+ "<div class='timeline-title" + inverted + "'>"
- + "<span class='timeline-title-span'>"
+ + "<span class='timeline-title-span'>";
- + "<div class='tg-env-buttons'>";
+
+
+ env_bts = "<div class='tg-env-buttons'>";
// INFO BUTTON
if (this.model.get("description")) {
- tmpl += "<div class='tg-env-button tg-env-info timeline-info-bt' data-timeline_id='${id}'></div>";
+ env_bts += "<div class='tg-env-button tg-env-info timeline-info-bt' data-timeline_id='${id}'></div>";
}
// LEGEND BUTTON
if (this.model.get("hasLegend")) {
- tmpl += "<div class='tg-env-button tg-env-legend tg-legend-bt' data-timeline_id='${id}'>legend</div>";
+ env_bts += "<div class='tg-env-button tg-env-legend tg-legend-bt' data-timeline_id='${id}'></div>";
}
// MAY WANT TO SUPPRESS THESE
// INVERT BUTTON
- tmpl += "<div class='tg-env-button tg-env-invert tg-invert-bt' data-timeline_id='${id}'></div>";
+ env_bts += "<div class='tg-env-button tg-env-invert tg-invert-bt' data-timeline_id='${id}'></div>";
// EXPAND BUTTON
- tmpl += "<div class='tg-env-button tg-env-expcol tg-expcol-bt' data-timeline_id='${id}'></div>";
-
+ env_bts += "<div class='tg-env-button tg-env-expcol tg-expcol-bt' data-timeline_id='${id}'></div>";
+ env_bts += "</div>";
+
+ env_b = (timeglider.mode == "preview" || timeglider.mode == "publish") ? env_bts : "";
- tmpl += "</div>${title}</span></div></div>";
+ tmpl += env_b + "${title}</span></div></div>";
} else if (this.titleBar == "imageBar") {
@@ -3483,11 +3529,16 @@ tg.TG_TimelineView = Backbone.View.extend({
var title = me.model.get("title");
var _template = me.getTemplate();
+
+ var state_class = this.model.get("inverted") ? "inverted" : "straight-up";
$(this.el)
.html($.tmpl(_template, this.model.attributes))
- .attr("id", this.model.get("id"));
-
+ .attr("id", this.model.get("id"))
+ .addClass(state_class);
+
+
+
return this;
},
View
107 js/timeglider/Timeglider.css
@@ -217,7 +217,7 @@
}
-.tg-timeline-envelope .titleBar .timeline-title.timeline-inverted {
+.tg-timeline-envelope.inverted .titleBar .timeline-title {
bottom:0;
}
@@ -232,13 +232,13 @@
}
-.timeline-title-span {
+.tg-timeline-envelope .timeline-title .timeline-title-span {
white-space: nowrap;
float:left;
display:block;
- font-size:14px;
- color:#FFF;
+ font-size:16px;
+ color:#fdfbf4;
-webkit-border-bottom-right-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
@@ -248,11 +248,13 @@
border-bottom-left-radius: 4px;
background-color:rgba(114,109,98,0.8);
- padding:4px 8px;
- margin-top:0px;
+ padding:6px 8px 3px 8px;
+ margin-top:2px;
+
+ text-shadow:1px 1px 0px #2f2c28;
}
-.timeline-title.timeline-inverted .timeline-title-span {
+.tg-timeline-envelope.inverted .timeline-title .timeline-title-span {
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
@@ -261,7 +263,6 @@
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
-
-webkit-border-top-right-radius: 4px;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topright: 4px;
@@ -409,8 +410,6 @@
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
-
-
}
@@ -420,7 +419,7 @@
left:0;
height:5000px;
width:1px;
- border-left:1px solid #FFF;
+ border-left:1px solid #b7b1a3;
}
.tg-tick-body {
@@ -456,7 +455,7 @@
color:#fefbf4;
height:22px;
width:150px;
- background-color:#013C4B;
+ background-color:#42383D;
-webkit-border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
@@ -480,14 +479,14 @@
border-left: 8px solid transparent;
border-right: 8px solid transparent;
/* needs to be same as bg of date-display */
- border-bottom: 8px solid #013C4B;
+ border-bottom: 8px solid #42383D;
opacity:.9;
}
.timeglider-tick-label {
- color:#fefbf4;
+ color:#FFF;
position:absolute;
top:3px;
left:4px;
@@ -506,7 +505,7 @@
.timeglider-tick-sub-label {
- color:#edb18d;
+ color:#d3cec2;
/* OLD float:left; display:inline; */
position:absolute;
height:14px;
@@ -522,11 +521,11 @@
background-repeat:no-repeat;
}
-
+/* eae6db */
.timeglider-tick-sub-label .minutes {
height:12px;
font-size:9px;
- color:#edb18d;
+ color:#d3cec2;
float:left;
margin:0;
border-left:1px solid #FFF;
@@ -537,7 +536,7 @@
.tg-tick-sublabel-group {
- top:15px;
+ top:13px;
background-color:none;
height:24px;
position:absolute;
@@ -616,11 +615,10 @@
.tg-close-button-small {
float:right;
cursor:pointer;
- width:15px;
- height:15px;
- background-image:url(buttons/close_small.png);
- margin-top:-8px;
- margin-right:-7px;
+ width:20px;
+ height:20px;
+ background-image:url(img/icon_close.png);
+
}
@@ -717,8 +715,8 @@
.tg-image-lane-bg {
position:absolute;
- top:-300px;
- height:300px;
+ top:-450px;
+ height:450px;
width:100%;
background-color:#ebe6db;
z-index:99;
@@ -774,6 +772,7 @@
cursor:pointer;
font-size:10px;
margin-left:16px;
+ margin-top:-2px;
font-weight:normal;
text-shadow:none;
}
@@ -789,19 +788,19 @@
.tg-env-buttons .tg-env-button.tg-env-info {
- background-image:url(img/icon_info.png);
+ background-image:url(img/info_tan4.png);
}
.tg-env-buttons .tg-env-button.tg-env-legend {
- background-image:url(img/icon_legend.png);
+ background-image:url(img/legend_tan4.png);
}
.tg-env-buttons .tg-env-button.tg-env-expcol {
- background-image:url(img/icon_expcol.png);
+ background-image:url(img/expcol_tan4.png);
}
.tg-env-buttons .tg-env-button.tg-env-invert {
- background-image:url(img/icon_invert.png);
+ background-image:url(img/invert_tan4.png);
}
@@ -818,18 +817,17 @@
height:26px;
cursor:pointer;
margin-right:12px;
- display:none;
}
.timeglider-filter-bt {
margin-right:6px;
- background-image:url(buttons/filter.png);
+ background-image:url(img/filter.png);
}
.timeglider-list-bt {
- background-image:url(buttons/list.png);
+ background-image:url(img/list.png);
}
.timeglider-settings-bt {
- background-image:url(buttons/tools.png);
+ background-image:url(img/tools.png);
}
/* MENU MODALS */
@@ -866,7 +864,7 @@
margin-top:-16px;
width:30px;
height:30px;
- background-image:url(buttons/close.png);
+ background-image:url(img/close.png);
}
@@ -903,11 +901,11 @@
cursor:pointer;
}
.timeglider-pan-left {
- background-image:url("buttons/pan_left.png");
+ background-image:url("img/pan_left.png");
margin-right:1px;
}
.timeglider-pan-right {
- background-image:url("buttons/pan_right.png");
+ background-image:url("img/pan_right.png");
}
/* add hover effects? */
@@ -970,14 +968,13 @@
.tg-legend {
- position:absolute;
- width:150px;
- -webkit-border-top-left-radius: 0;
- -webkit-border-top-right-radius: 0;
- -moz-border-radius-topleft: 0;
- -moz-border-radius-topright: 0;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
+ position:absolute;
+ width:150px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ border-radius:3px;
+ border:4px solid #b7b1a3;
+ background-color:#fdfbf4;
}
.tg-legend img {
@@ -990,6 +987,11 @@
margin-top:8px;
}
+.tg-legend ul {
+ margin-top:-16px;
+}
+
+
.tg-legend ul li {
color:#999;
}
@@ -1005,12 +1007,11 @@
.tg-legend-all {
- float:right;
- font-size:9px;
- color:#777;
+ font-size:12px;
+ color:#8DB91C;
cursor:pointer;
- margin-right:12px;
- margin-top:-4px;
+ margin-left:20px;
+ margin-top:8px;
}
@@ -1057,6 +1058,8 @@
.timeglider-event-spanner {
position:absolute;
+ top:0;
+ left:0;
background-color:#ccc;
height:16px;
z-index:1;
@@ -1139,10 +1142,10 @@
}
.tg-modal-corner-north {
- width:28px;
- height:18px;
+ width:18px;
+ height:12px;
left:32px;
- top:-18px;
+ top:-12px;
background-image:url(img/modal_corner_north.png);
background-repeat:no-repeat;
}
View
BIN js/timeglider/buttons/corner-pointer.png
Deleted file not rendered
View
BIN js/timeglider/buttons/dummies.png
Deleted file not rendered
View
BIN js/timeglider/buttons/filter.psd
Deleted file not rendered
View
BIN js/timeglider/buttons/footer_bg.png
Deleted file not rendered
View
BIN js/timeglider/buttons/list2.png
Deleted file not rendered
View
BIN js/timeglider/buttons/pan_left.png
Deleted file not rendered
View
BIN js/timeglider/buttons/pan_right.png
Deleted file not rendered
View
BIN js/timeglider/icons/circle_black.png
Deleted file not rendered
View
BIN js/timeglider/icons/circle_yellow.png
Deleted file not rendered
View
BIN js/timeglider/icons/flag_yellow.png
Deleted file not rendered
View
BIN js/timeglider/icons/flask.png
Deleted file not rendered
View
BIN js/timeglider/icons/goldstar.png
Deleted file not rendered
View
BIN js/timeglider/icons/halfcircle_yellow.png
Deleted file not rendered
View
BIN js/timeglider/icons/plus_yellow.png
Deleted file not rendered
View
BIN js/timeglider/icons/quote.png
Deleted file not rendered
View
BIN js/timeglider/icons/report.png
Deleted file not rendered
View
1 js/timeglider/icons/shapes/_notes/dwsync.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8" ?>
View
BIN js/timeglider/icons/shapes/circle_black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 js/timeglider/icons/circle_blue.png → js/timeglider/icons/shapes/circle_blue.png
File renamed without changes
View
0 js/timeglider/icons/circle_gray.png → js/timeglider/icons/shapes/circle_gray.png
File renamed without changes
View
0 js/timeglider/icons/circle_green.png → js/timeglider/icons/shapes/circle_green.png
File renamed without changes
View
0 js/timeglider/icons/circle_orange.png → js/timeglider/icons/shapes/circle_orange.png
File renamed without changes
View
0 js/timeglider/icons/circle_purple.png → js/timeglider/icons/shapes/circle_purple.png
File renamed without changes
View
0 js/timeglider/icons/circle_red.png → js/timeglider/icons/shapes/circle_red.png
File renamed without changes
View
BIN js/timeglider/icons/shapes/circle_white.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN js/timeglider/icons/shapes/circle_yellow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 js/timeglider/icons/flag_black.png → js/timeglider/icons/shapes/flag_black.png
Diff not rendered.
View
0 js/timeglider/icons/flag_blue.png → js/timeglider/icons/shapes/flag_blue.png
Diff not rendered.
View
0 js/timeglider/icons/flag_gray.png → js/timeglider/icons/shapes/flag_gray.png
Diff not rendered.
View
0 js/timeglider/icons/flag_green.png → js/timeglider/icons/shapes/flag_green.png
Diff not rendered.
View
0 js/timeglider/icons/flag_orange.png → js/timeglider/icons/shapes/flag_orange.png
Diff not rendered.
View
0 js/timeglider/icons/flag_purple.png → js/timeglider/icons/shapes/flag_purple.png
Diff not rendered.
View
0 js/timeglider/icons/flag_red.png → js/timeglider/icons/shapes/flag_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/flag_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/flag_yellow.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_black.png → ...eglider/icons/shapes/halfcircle_black.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_blue.png → ...meglider/icons/shapes/halfcircle_blue.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_gray.png → ...meglider/icons/shapes/halfcircle_gray.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_green.png → ...eglider/icons/shapes/halfcircle_green.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_orange.png → ...glider/icons/shapes/halfcircle_orange.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_purple.png → ...glider/icons/shapes/halfcircle_purple.png
Diff not rendered.
View
0 js/timeglider/icons/halfcircle_red.png → ...imeglider/icons/shapes/halfcircle_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/halfcircle_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/halfcircle_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_black.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_blue.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_gray.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_green.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_orange.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_purple.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/inf_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_black.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_blue.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_gray.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_green.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_orange.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_purple.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/music_yellow.png
Diff not rendered.
View
0 js/timeglider/icons/plus_black.png → js/timeglider/icons/shapes/plus_black.png
Diff not rendered.
View
0 js/timeglider/icons/plus_blue.png → js/timeglider/icons/shapes/plus_blue.png
Diff not rendered.
View
0 js/timeglider/icons/plus_gray.png → js/timeglider/icons/shapes/plus_gray.png
Diff not rendered.
View
0 js/timeglider/icons/plus_green.png → js/timeglider/icons/shapes/plus_green.png
Diff not rendered.
View
0 js/timeglider/icons/plus_orange.png → js/timeglider/icons/shapes/plus_orange.png
Diff not rendered.
View
0 js/timeglider/icons/plus_purple.png → js/timeglider/icons/shapes/plus_purple.png
Diff not rendered.
View
0 js/timeglider/icons/plus_red.png → js/timeglider/icons/shapes/plus_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/plus_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/plus_yellow.png
Diff not rendered.
View
1 js/timeglider/icons/shapes/process copy/_notes/dwsync.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8" ?>
View
BIN js/timeglider/icons/shapes/process copy/check_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/clover_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/gear_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/heart_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/lightning_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/moon_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/target_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process copy/warning_COLOR.png
Diff not rendered.
View
1 js/timeglider/icons/shapes/process/_notes/dwsync.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8" ?>
View
BIN js/timeglider/icons/shapes/process/check_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/clover_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/gear_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/heart_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/lightning_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/moon_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/target_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process/warning_COLOR.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/process_done/.DS_Store
Binary file not shown.
View
0 js/timeglider/icons/square_black.png → js/timeglider/icons/shapes/square_black.png
Diff not rendered.
View
0 js/timeglider/icons/square_blue.png → js/timeglider/icons/shapes/square_blue.png
Diff not rendered.
View
0 js/timeglider/icons/square_gray.png → js/timeglider/icons/shapes/square_gray.png
Diff not rendered.
View
0 js/timeglider/icons/square_green.png → js/timeglider/icons/shapes/square_green.png
Diff not rendered.
View
0 js/timeglider/icons/square_orange.png → js/timeglider/icons/shapes/square_orange.png
Diff not rendered.
View
0 js/timeglider/icons/square_purple.png → js/timeglider/icons/shapes/square_purple.png
Diff not rendered.
View
0 js/timeglider/icons/square_red.png → js/timeglider/icons/shapes/square_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/square_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/square_yellow.png
Diff not rendered.
View
0 js/timeglider/icons/star_black.png → js/timeglider/icons/shapes/star_black.png
Diff not rendered.
View
0 js/timeglider/icons/star_blue.png → js/timeglider/icons/shapes/star_blue.png
Diff not rendered.
View
0 js/timeglider/icons/star_gray.png → js/timeglider/icons/shapes/star_gray.png
Diff not rendered.
View
0 js/timeglider/icons/star_green.png → js/timeglider/icons/shapes/star_green.png
Diff not rendered.
View
0 js/timeglider/icons/star_orange.png → js/timeglider/icons/shapes/star_orange.png
Diff not rendered.
View
0 js/timeglider/icons/star_purple.png → js/timeglider/icons/shapes/star_purple.png
Diff not rendered.
View
0 js/timeglider/icons/star_red.png → js/timeglider/icons/shapes/star_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/star_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/star_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_card_club.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_card_diamond.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_card_heart.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_card_spade.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_file.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_goldstar.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_location.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_question.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/sym_warning.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_black.png → ...imeglider/icons/shapes/triangle_black.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_blue.png → js/timeglider/icons/shapes/triangle_blue.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_gray.png → js/timeglider/icons/shapes/triangle_gray.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_green.png → ...imeglider/icons/shapes/triangle_green.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_orange.png → ...meglider/icons/shapes/triangle_orange.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_purple.png → ...meglider/icons/shapes/triangle_purple.png
Diff not rendered.
View
0 js/timeglider/icons/triangle_red.png → js/timeglider/icons/shapes/triangle_red.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/triangle_white.png
Diff not rendered.
View
BIN js/timeglider/icons/shapes/triangle_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/square_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/triangle_yellow.png
Diff not rendered.
View
BIN js/timeglider/icons/video.png
Diff not rendered.
View
1 js/timeglider/img/_notes/dwsync.xml
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
View
0 js/timeglider/buttons/close.png → js/timeglider/img/close.png 100644 → 100755
Diff not rendered.
View
0 js/timeglider/buttons/close_small.png → js/timeglider/img/close_small.png 100644 → 100755
Diff not rendered.
View
BIN js/timeglider/img/expcol_tan4.png
Diff not rendered.
View
0 js/timeglider/buttons/filter.png → js/timeglider/img/filter.png 100644 → 100755
Diff not rendered.
View
BIN js/timeglider/img/icon_expcol.png
Diff not rendered.
View
BIN js/timeglider/img/icon_info.png
Diff not rendered.
View
BIN js/timeglider/img/icon_invert.png
Diff not rendered.
View
BIN js/timeglider/img/icon_legend.png
Diff not rendered.