Changeset 103
- Timestamp:
- 04/27/08 19:19:03 (2 months ago)
- Files:
-
- trunk/microfacts/public/app/controllers/thread_controller.js (modified) (2 diffs)
- trunk/microfacts/public/app/controllers/thread_timeline_controller.js (added)
- trunk/microfacts/public/app/lib/timeline.js (added)
- trunk/microfacts/public/assets/jsinclude.txt (modified) (2 diffs)
- trunk/microfacts/templates/layout.html (modified) (3 diffs)
- trunk/microfacts/templates/thread/read.html (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/microfacts/public/app/controllers/thread_controller.js
r101 r103 38 38 new FactletSearchController(this, $('factlet-search')); 39 39 } 40 if ($('thread-timeline')) { 41 new ThreadTimelineController(this, $('thread-timeline')); 42 } 40 43 } 41 44 } … … 50 53 } 51 54 this.deck.focusOn(factletElem); 55 console.log('Should update timeline'); 52 56 } 53 57 } trunk/microfacts/public/assets/jsinclude.txt
r88 r103 4 4 lib/model 5 5 lib/controller 6 lib/timeline 6 7 models/thread 7 8 models/factlet … … 11 12 controllers/factlet_info_controller 12 13 controllers/factlet_search_controller 14 controllers/thread_timeline_controller trunk/microfacts/templates/layout.html
r88 r103 19 19 <script src="/vendor/mootools-trunk-1516.js" type="text/javascript" charset="utf-8"></script> 20 20 <script src="/vendor/ejs/ejs.js" type="text/javascript" charset="utf-8"></script> 21 <script src="/vendor/simile/timeline/timeline-api.js" type="text/javascript" charset="utf-8"></script> 21 22 22 23 <!-- #jsincludeSTART --> … … 27 28 <script type="text/javascript" charset="utf-8" src="/app/lib/model.js"></script> 28 29 <script type="text/javascript" charset="utf-8" src="/app/lib/controller.js"></script> 30 <script type="text/javascript" charset="utf-8" src="/app/lib/timeline.js"></script> 29 31 <script type="text/javascript" charset="utf-8" src="/app/models/thread.js"></script> 30 32 <script type="text/javascript" charset="utf-8" src="/app/models/factlet.js"></script> … … 34 36 <script type="text/javascript" charset="utf-8" src="/app/controllers/factlet_info_controller.js"></script> 35 37 <script type="text/javascript" charset="utf-8" src="/app/controllers/factlet_search_controller.js"></script> 38 <script type="text/javascript" charset="utf-8" src="/app/controllers/thread_timeline_controller.js"></script> 36 39 37 40 <!-- #jsincludeEND --> trunk/microfacts/templates/thread/read.html
r95 r103 14 14 15 15 <body> 16 <aside id="thread-control-${c.thread.id}" py:if="len(c.thread.factlets) > 0">16 <aside id="thread-control-${c.thread.id}"> 17 17 <h2>Thread control:</h2> 18 18 <p>To move between different Factlets in the Thread either use the … … 27 27 </p> 28 28 </aside> 29 30 <aside id="thread-timeline-control-${c.thread.id}"> 31 <h2>Timeline control:</h2> 32 <p>To scroll the timeline click and drag horizontally (in any band). To resize the timeline click and drag vertically.</p> 33 <p><strong>TODO: make these buttons functional (js only)</strong></p> 34 <form> 35 <input type="button" value="Show Timeline" class="show" /> 36 <input type="button" value="Hide Timeline" class="hide" /> 37 </form> 38 <p><strong>TODO: might want to move to having an explicit thread timeline view in which timeline is vertical and replaces the factlet-info box on the right ...</strong></p> 39 </aside> 29 40 30 41 <div id="thread-${c.thread.id}" class="thread"> … … 34 45 (${h.link_to("Edit", h.url_for(controller='thread', action='update'))}) 35 46 </h2> 47 <div id="thread-timeline" style="height: 150px; border: 1px solid #aaa; margin-bottom: 20px;"></div> 36 48 37 49 <py:choose>
