diff options
24 files changed, 142 insertions, 70 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 3c0fbe5..d986b7a 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -21,7 +21,7 @@ app.mode = { editor: false, builder: false } app.init = function () { app.tube = new Tube () - app.router = new Router () + app.router = new SiteRouter () } app.launch = function () { diff --git a/public/assets/javascripts/rectangles/util/sort.js b/public/assets/javascripts/rectangles/util/sort.js index 0985b75..a0665ae 100644 --- a/public/assets/javascripts/rectangles/util/sort.js +++ b/public/assets/javascripts/rectangles/util/sort.js @@ -64,7 +64,7 @@ function sort_rooms_by_position(list){ function sort_rooms_by_area(list){ return list.map(room_area_tuple) .sort(compare_car) - .map(cdr) + .map(cdr) } function sort_rects_by_position(list){ diff --git a/public/assets/javascripts/ui/BuilderView.js b/public/assets/javascripts/ui/BuilderView.js deleted file mode 100644 index c91d9ee..0000000 --- a/public/assets/javascripts/ui/BuilderView.js +++ /dev/null @@ -1,23 +0,0 @@ - -var BuilderView = View.extend({ - el: "#builderView", - - events: { - "click [data-role='toggle-map-view']": 'toggleMap', - "click [data-role='toggle-layout-settings']": 'toggleSettings', - }, - - load: function(){ - $("#map").show() - }, - - toggleMap: function(){ - map.toggle() - }, - - toggleSettings: function(){ - this.$(".settings").toggleClass("active") - }, - -}) - diff --git a/public/assets/javascripts/ui/Router.js b/public/assets/javascripts/ui/SiteRouter.js index 5b75162..c02b19c 100644 --- a/public/assets/javascripts/ui/Router.js +++ b/public/assets/javascripts/ui/SiteRouter.js @@ -1,5 +1,5 @@ -var Router = View.extend({ +var SiteRouter = Router.extend({ el: "body", events: { @@ -26,8 +26,6 @@ var Router = View.extend({ }, initialize: function(){ - this.builderView = new BuilderView() - this.editorView = new EditorView() this.signUpModal = new SignUpModal() this.signInModal = new SignInModal() this.newProjectModal = new NewProjectModal() @@ -37,40 +35,24 @@ var Router = View.extend({ this.confirmModal = new ConfirmModal() this.alertModal = new AlertModal() - this.originalPath = window.location.pathname + this.route() - var path = window.location.pathname.split("/") - // console.log(path) - for (var route in this.routes) { - var routePath = route.split("/") - if (routePath[1] == path[1]) { - if (routePath[2] && routePath[2].indexOf(":") !== -1 && path[2] && (path[3] === routePath[3]) ) { - this[this.routes[route]](null, path[2]) - break; - } - else if (routePath[2] == path[2]) { - this[this.routes[route]](null) - break; - } - else if (! routePath[2] && (! path[2].length || ! path[2])) { - this[this.routes[route]](null) - break; - } - } - } - $("body").removeClass("loading") }, launchBuilder: function(){ app.mode.builder = true app.launch() + + this.builderView = new BuilderView() this.builderView.load() }, launchEditor: function(){ app.mode.editor = true app.launch() + + this.editorView = new EditorView() this.editorView.load() }, diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js new file mode 100644 index 0000000..b598a18 --- /dev/null +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -0,0 +1,18 @@ + + + + +var BuilderSettings = View.extend({ + el: "#builderSettings", + + events: { + }, + + initialize: function(){ + }, + + toggle: function(){ + this.$el.toggleClass("active") + } + +}) diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js new file mode 100644 index 0000000..42d4306 --- /dev/null +++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js @@ -0,0 +1,42 @@ + +var BuilderToolbar = View.extend({ + el: "#builderToolbar", + + events: { + "click [data-role='toggle-map-view']": 'toggleMap', + "click [data-role='toggle-layout-settings']": 'toggleSettings', + "click [data-role='undo']": 'undo', + "click [data-role='draw']": 'draw', + "click [data-role='resize']": 'resize', + "click [data-role='move']": 'move', + "click [data-role='delete']": 'delete', + }, + + initialize: function(opt){ + this.parent = opt.parent + }, + + toggleMap: function(){ + map.toggle() + }, + + toggleSettings: function(){ + this.parent.settings.toggle() + }, + + undo: function(){ + }, + + draw: function(){ + }, + + resize: function(){ + }, + + move: function(){ + }, + + delete: function(){ + }, + +}) diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js new file mode 100644 index 0000000..d0659bb --- /dev/null +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -0,0 +1,17 @@ + +var BuilderView = View.extend({ + el: "#builderView", + + events: { + }, + + initialize: function(){ + this.toolbar = new BuilderToolbar ({ parent: this }) + this.settings = new BuilderSettings ({ parent: this }) + }, + + load: function(){ + $("#map").show() + }, + +}) diff --git a/public/assets/javascripts/ui/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index 91329de..91329de 100644 --- a/public/assets/javascripts/ui/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js diff --git a/public/assets/javascripts/ui/AlertModal.js b/public/assets/javascripts/ui/lib/AlertModal.js index c5693ad..c5693ad 100644 --- a/public/assets/javascripts/ui/AlertModal.js +++ b/public/assets/javascripts/ui/lib/AlertModal.js diff --git a/public/assets/javascripts/ui/ConfirmModal.js b/public/assets/javascripts/ui/lib/ConfirmModal.js index 868ce8e..868ce8e 100644 --- a/public/assets/javascripts/ui/ConfirmModal.js +++ b/public/assets/javascripts/ui/lib/ConfirmModal.js diff --git a/public/assets/javascripts/vendor/ModalFormView.js b/public/assets/javascripts/ui/lib/ModalFormView.js index d084031..d084031 100644 --- a/public/assets/javascripts/vendor/ModalFormView.js +++ b/public/assets/javascripts/ui/lib/ModalFormView.js diff --git a/public/assets/javascripts/vendor/ModalView.js b/public/assets/javascripts/ui/lib/ModalView.js index b90b3c4..b90b3c4 100644 --- a/public/assets/javascripts/vendor/ModalView.js +++ b/public/assets/javascripts/ui/lib/ModalView.js diff --git a/public/assets/javascripts/ui/lib/Router.js b/public/assets/javascripts/ui/lib/Router.js new file mode 100644 index 0000000..d06c07a --- /dev/null +++ b/public/assets/javascripts/ui/lib/Router.js @@ -0,0 +1,28 @@ +var Router = View.extend({ + + route: function(){ + + this.originalPath = window.location.pathname + + var path = window.location.pathname.split("/") + // console.log(path) + for (var route in this.routes) { + var routePath = route.split("/") + if (routePath[1] == path[1]) { + if (routePath[2] && routePath[2].indexOf(":") !== -1 && path[2] && (path[3] === routePath[3]) ) { + this[this.routes[route]](null, path[2]) + break; + } + else if (routePath[2] == path[2]) { + this[this.routes[route]](null) + break; + } + else if (! routePath[2] && (! path[2].length || ! path[2])) { + this[this.routes[route]](null) + break; + } + } + } + } + +}) diff --git a/public/assets/javascripts/vendor/view.js b/public/assets/javascripts/ui/lib/view.js index 823a75b..823a75b 100644 --- a/public/assets/javascripts/vendor/view.js +++ b/public/assets/javascripts/ui/lib/view.js diff --git a/public/assets/javascripts/ui/DocumentModal.js b/public/assets/javascripts/ui/site/DocumentModal.js index 6f16169..6f16169 100644 --- a/public/assets/javascripts/ui/DocumentModal.js +++ b/public/assets/javascripts/ui/site/DocumentModal.js diff --git a/public/assets/javascripts/ui/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js index 6b89ad8..6b89ad8 100644 --- a/public/assets/javascripts/ui/EditProfileModal.js +++ b/public/assets/javascripts/ui/site/EditProfileModal.js diff --git a/public/assets/javascripts/ui/EditProjectModal.js b/public/assets/javascripts/ui/site/EditProjectModal.js index 356d8b7..356d8b7 100644 --- a/public/assets/javascripts/ui/EditProjectModal.js +++ b/public/assets/javascripts/ui/site/EditProjectModal.js diff --git a/public/assets/javascripts/ui/NewProjectModal.js b/public/assets/javascripts/ui/site/NewProjectModal.js index cf2044f..cf2044f 100644 --- a/public/assets/javascripts/ui/NewProjectModal.js +++ b/public/assets/javascripts/ui/site/NewProjectModal.js diff --git a/public/assets/javascripts/ui/SignInModal.js b/public/assets/javascripts/ui/site/SignInModal.js index 4c91b54..4c91b54 100644 --- a/public/assets/javascripts/ui/SignInModal.js +++ b/public/assets/javascripts/ui/site/SignInModal.js diff --git a/public/assets/javascripts/ui/SignUpModal.js b/public/assets/javascripts/ui/site/SignUpModal.js index 5c651ee..5c651ee 100644 --- a/public/assets/javascripts/ui/SignUpModal.js +++ b/public/assets/javascripts/ui/site/SignUpModal.js diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e5666ca..1ad2409 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -372,6 +372,8 @@ h5{ } .topLinks { float: right; + z-index: 3; + position: relative; font-size: 18px; padding: 8px; margin: 14px; @@ -384,7 +386,7 @@ h5{ color: black; font-weight: 300; text-decoration: none; - border-bottom:1px solid white; + border-bottom:1px solid transparent; } .topLinks a:hover { border-bottom:1px solid lightgreen; @@ -533,7 +535,7 @@ h5{ backface-visibility: visible; } #hud { - position: absolute; + position: fixed; top:0;left:0; z-index: 2; } diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index f92d1c7..c91f7b5 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -1,4 +1,4 @@ -<div class="vvbox settings"> +<div class="vvbox settings" id="builderSettings"> <div class="setting"> <a href="#" id="startpoint"> @@ -19,11 +19,11 @@ </div> <div class="setting"> <div class="radio-group"> - <input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked"> + <input id="opt_1" class="radio-group__option" type="radio" name="opt" value="public" checked="checked"> <label class="radio-group__label" for="opt_1"> Everyone </label> - <input id="opt_2" class="radio-group__option" type="radio" name="opt"> + <input id="opt_2" class="radio-group__option" type="radio" name="opt" value="private"> <label class="radio-group__label" for="opt_2"> Just for me </label> @@ -37,4 +37,4 @@ <a href="#">Clear</a> <a href="#" id="deleteRoom">Delete</a> </div> -</div>
\ No newline at end of file +</div> diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 1d57322..400a008 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -1,4 +1,4 @@ -<div class="edit menu vvbox"> +<div class="edit menu vvbox" id="builderToolbar"> <span data-info="add media" class="icon-ios7-photos-outline"></span> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index c80c174..e9ec5a5 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -4,7 +4,6 @@ <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script> -<script type="text/javascript" src="/assets/javascripts/vendor/view.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script> <script type="text/javascript" src="/assets/javascripts/util.js"></script> @@ -43,19 +42,26 @@ <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script> -<script type="text/javascript" src="/assets/javascripts/vendor/ModalView.js"></script> -<script type="text/javascript" src="/assets/javascripts/vendor/ModalFormView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/ModalFormView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/Router.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/SignInModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/SignUpModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/NewProjectModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/EditProjectModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/EditProfileModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/DocumentModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/AlertModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/ConfirmModal.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/BuilderView.js"></script> -<script type="text/javascript" src="/assets/javascripts/ui/EditorView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/SignInModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/SignUpModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/NewProjectModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/EditProjectModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/EditProfileModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/site/DocumentModal.js"></script> + +<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderSettings.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script> + +<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script> + +<script type="text/javascript" src="/assets/javascripts/ui/SiteRouter.js"></script> <script type="text/javascript" src="/assets/javascripts/app.js"></script> |