diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
| commit | 712387da2f75c845807ad4489b29fec34bfe9a56 (patch) | |
| tree | 2fab35671b730b7305b920ba1b63299fd8fa4922 /views | |
| parent | 9151023c978bd3aed20ad00d5d3301dfe7ed2a2a (diff) | |
| parent | 1668d6e2e20c9bd53f3f6a299541c582da9742b4 (diff) | |
merge
Diffstat (limited to 'views')
| -rwxr-xr-x | views/editor.ejs | 12 | ||||
| -rw-r--r-- | views/partials/header.ejs | 2 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 5 |
3 files changed, 4 insertions, 15 deletions
diff --git a/views/editor.ejs b/views/editor.ejs index cd31b41..a79eb9a 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -20,21 +20,9 @@ [[ include controls/editor/settings ]] </div> - <!-- <div id="minimap" class="vvbox"> <span class="el"></span> </div> - --> - - <select id="palette"> - <option>colors</option> - <option>redblue</option> - <option>gray</option> - <option selected>bone</option> - <option>alpha</option> - <option>white</option> - <option>black</option> - </select> <div id="hud"> <div id="map" style="display: block"> diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 55505ed..e83f42a 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -7,7 +7,7 @@ <a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a> [[ } ]] - <a href="/project" class="topLink">Projects</a> + <a href="/project" data-role="show-projects-modal" class="topLink">Projects</a> [[ if (profile && String(user._id) == String(profile._id)) { ]] <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 2d34480..abc9623 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -10,8 +10,8 @@ <script type="text/javascript" src="/assets/javascripts/util.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script> -<script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/constants.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script> @@ -38,7 +38,8 @@ <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script> -<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_minimap.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/mx.js"></script> |