diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/ninja.reel/ninja.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 34dc8135..52a6daa2 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -332,7 +332,6 @@ | |||
| 332 | "toolsList": {"@": "toolsList1"}, | 332 | "toolsList": {"@": "toolsList1"}, |
| 333 | "toolsProperties": {"@": "toolsProperties1"}, | 333 | "toolsProperties": {"@": "toolsProperties1"}, |
| 334 | "stage": {"@": "stage1"}, | 334 | "stage": {"@": "stage1"}, |
| 335 | "settings": {"@": "settings1"}, | ||
| 336 | "elementMediator": {"@": "elementMediator"}, | 335 | "elementMediator": {"@": "elementMediator"}, |
| 337 | "dragDropMediator": {"@": "dragDropMediator"}, | 336 | "dragDropMediator": {"@": "dragDropMediator"}, |
| 338 | "undocontroller": {"@": "undocontroller1"}, | 337 | "undocontroller": {"@": "undocontroller1"}, |
| @@ -364,10 +363,10 @@ | |||
| 364 | </head> | 363 | </head> |
| 365 | <body> | 364 | <body> |
| 366 | 365 | ||
| 367 | <div id="main" class="main"> | 366 | <div data-montage-id="main" class="main"> |
| 368 | 367 | ||
| 369 | <section id="topMenu"> | 368 | <section id="topMenu"> |
| 370 | <nav id="mainMenuBar"></nav> | 369 | <nav data-montage-id="mainMenuBar"></nav> |
| 371 | </section> | 370 | </section> |
| 372 | 371 | ||
| 373 | <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section> | 372 | <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section> |
| @@ -377,22 +376,20 @@ | |||
| 377 | <section id="appContainer"> | 376 | <section id="appContainer"> |
| 378 | <section data-montage-id="topSplitter" class="topSplitter splitter"></section> | 377 | <section data-montage-id="topSplitter" class="topSplitter splitter"></section> |
| 379 | 378 | ||
| 380 | <section id="topPanelContainer" class="panelContainer"> | 379 | <section data-montage-id="topPanelContainer" id="topPanelContainer" class="panelContainer"> |
| 381 | <div id="topPanel" class="panel"> | 380 | <div id="topPanel" class="panel"> |
| 382 | <div id="toolPropertiesPanel"> | 381 | <div id="toolPropertiesPanel"> |
| 383 | <div id="toolsProperties"></div> | 382 | <div data-montage-id="toolsProperties"></div> |
| 384 | </div> | 383 | </div> |
| 385 | 384 | ||
| 386 | <div id="stageMode" class="unselectable marginposition"> | 385 | <div data-montage-id="stageMode" class="unselectable marginposition"></div> |
| 387 | <!--<div id="stageModeImg" class="unselectable editMode"></div>--> | ||
| 388 | </div> | ||
| 389 | </div> | 386 | </div> |
| 390 | </section> | 387 | </section> |
| 391 | 388 | ||
| 392 | <section id="appWorkspace"> | 389 | <section id="appWorkspace"> |
| 393 | <section id="leftPanelContainer" class="panelContainer"> | 390 | <section data-montage-id="leftPanelContainer" id="leftPanelContainer" class="panelContainer"> |
| 394 | <section id="toolsPanelContent" class="panel"> | 391 | <section id="toolsPanelContent" class="panel"> |
| 395 | <div id="toolsList"></div> | 392 | <div data-montage-id="toolsList"></div> |
| 396 | </section> | 393 | </section> |
| 397 | </section> | 394 | </section> |
| 398 | 395 | ||
| @@ -400,33 +397,33 @@ | |||
| 400 | <section class="mainContainerContent"> | 397 | <section class="mainContainerContent"> |
| 401 | 398 | ||
| 402 | <section id="documentTabs"> | 399 | <section id="documentTabs"> |
| 403 | <div id="openDocumentsTabComponent"></div> | 400 | <div data-montage-id="openDocumentsTabComponent" class="openDocumentsTab"></div> |
| 404 | </section> | 401 | </section> |
| 405 | 402 | ||
| 406 | <section id="rulerTop"></section> | 403 | <section data-montage-id="rulerTop" class="rulerTop"></section> |
| 407 | 404 | ||
| 408 | <section id="mainContent"> | 405 | <section id="mainContent"> |
| 409 | <section id="rulerLeft"></section> | 406 | <section data-montage-id="rulerLeft" class="rulerLeft"></section> |
| 410 | <section id="stageAndScenesContainer"></section> | 407 | <section data-montage-id="stageAndScenesContainer"></section> |
| 411 | <section id="pasteboardResizer" class="pasteboardResizer resizeBar"></section> | 408 | <section data-montage-id="pasteboardResizer" class="pasteboardResizer resizeBar"></section> |
| 412 | </section> | 409 | </section> |
| 413 | <section id="timelineResizer" class="timelineResizer resizeBar"></section> | 410 | <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section> |
| 414 | <section id="stateBar"> | 411 | <section id="stateBar"> |
| 415 | <section id="documentBarContainer"> | 412 | <section id="documentBarContainer"> |
| 416 | <div id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div> | 413 | <div data-montage-id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div> |
| 417 | <div id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div> | 414 | <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div> |
| 418 | </section> | 415 | </section> |
| 419 | </section> | 416 | </section> |
| 420 | 417 | ||
| 421 | <section id="breadCrumbComponent"></section> | 418 | <section data-montage-id="breadCrumbComponent"></section> |
| 422 | <div id="timelinePanelComponent" data-montage-id="timelinePanel" class="timelinePanel"></div> | 419 | <div data-montage-id="timelinePanelComponent" class="timelinePanel"></div> |
| 423 | </section> | 420 | </section> |
| 424 | </section> | 421 | </section> |
| 425 | 422 | ||
| 426 | <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> | 423 | <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> |
| 427 | 424 | ||
| 428 | <section id="rightPanelContainer" data-montage-id="rightPanelContainer" class="rightPanelContainer panelContainer"> | 425 | <section data-montage-id="rightPanelContainer" id="rightPanelContainer" class="rightPanelContainer panelContainer"> |
| 429 | <section id="rightPanelContent" class="rightPanelContent"> | 426 | <section data-montage-id="rightPanelContent" class="rightPanelContent"> |
| 430 | </section> | 427 | </section> |
| 431 | </section> | 428 | </section> |
| 432 | </section> | 429 | </section> |
| @@ -436,7 +433,7 @@ | |||
| 436 | 433 | ||
| 437 | <div data-montage-id="focus-container" class="hidden"></div> | 434 | <div data-montage-id="focus-container" class="hidden"></div> |
| 438 | 435 | ||
| 439 | <section id="popupWindows"></section> | 436 | <section data-montage-id="popupWindows"></section> |
| 440 | 437 | ||
| 441 | </div> | 438 | </div> |
| 442 | 439 | ||