diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/modal.ejs (renamed from views/login.ejs) | 13 | ||||
| -rw-r--r-- | views/partials/header.ejs | 2 | ||||
| -rw-r--r-- | views/partials/meta.ejs | 4 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 94 | ||||
| -rw-r--r-- | views/profile.ejs | 4 | ||||
| -rw-r--r-- | views/projects/new-project.ejs (renamed from views/projects/create-project.ejs) | 0 |
6 files changed, 55 insertions, 62 deletions
diff --git a/views/login.ejs b/views/modal.ejs index b37d18d..b47f6aa 100644 --- a/views/login.ejs +++ b/views/modal.ejs @@ -3,11 +3,6 @@ <head> <title>vvalls</title> [[ include partials/meta ]] - <script> - window.addEventListener("load",function() { - window.scrollTo(0,0) - }, false); - </script> </head> <body class="loading"> <div class="rapper page" style="height: 100%;"> @@ -16,14 +11,12 @@ <div style="height: 70%; clear: both;"></div> [[ include partials/signin ]] + [[ include projects/new-project ]] + [[ include projects/edit-project ]] [[ include partials/footer ]] </div> </body> [[ include partials/scripts ]] -<script> -setTimeout(function(){ - $("[data-role='show-signin-modal']").trigger("click") -}) -</script> +<script>window.isModalView = true</script> </html> diff --git a/views/partials/header.ejs b/views/partials/header.ejs index d6c8fa9..c706aa1 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -1,4 +1,4 @@ -<a href="/" class="logo"><img src="assets/img/logo4.svg"></a> +<a href="/" class="logo"><img src="/assets/img/logo4.svg"></a> <span class="topLinks"> [[ if (logged_in) { ]] diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index 32a3318..d1397c6 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -13,8 +13,8 @@ <meta property="og:site_name" content="" /> <link rel="icon" href="favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> - <link href='assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'> - <link href='assets/stylesheets/app.css' rel='stylesheet' type='text/css'> + <link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'> + <link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'> <!--[if lt IE 9]> <style> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index c8f65f6..e466f8b 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -1,54 +1,54 @@ -<script type="text/javascript" src="assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script> -<script type="text/javascript" src="assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script> -<script type="text/javascript" src="assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script> -<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> +<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script> +<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script> +<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script> +<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> -<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/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> -<script type="text/javascript" src="assets/javascripts/rectangles/util/mouse.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/util/keys.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/room.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/wall.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/tree.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/rect.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/vec2.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/vec3.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/models/mat4.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/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> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/room.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/rooms/_rooms.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/rooms/builder.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/rooms/clipper.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/rooms/mover.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/mover.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery/_scenery.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery/image/_image.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery/image/move.js"></script> -<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery/image/resize.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/image/_image.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/image/move.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/image/resize.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/draw.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/draw.js"></script> -<script type="text/javascript" src="assets/javascripts/mx/mx.js"></script> -<script type="text/javascript" src="assets/javascripts/mx/extensions/mx.scene.js"></script> -<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/mx/mx.js"></script> +<script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.scene.js"></script> +<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/ui/ModalView.js"></script> -<script type="text/javascript" src="assets/javascripts/ui/MasterView.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/CreateProjectModal.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/ModalView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/MasterView.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/app.js"></script> +<script type="text/javascript" src="/assets/javascripts/app.js"></script> diff --git a/views/profile.ejs b/views/profile.ejs index 26f1ee1..8540785 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -41,10 +41,10 @@ [[ include projects/list-projects ]] - <a href="#" data-role="create-project-modal" class="viewMore" id="createProject">create project</a> + <a href="#" data-role="new-project-modal" class="viewMore" id="createProject">create project</a> [[ include partials/edit-profile ]] - [[ include projects/create-project ]] + [[ include projects/new-project ]] [[ include projects/edit-project ]] [[ include partials/footer ]] diff --git a/views/projects/create-project.ejs b/views/projects/new-project.ejs index e151f3a..e151f3a 100644 --- a/views/projects/create-project.ejs +++ b/views/projects/new-project.ejs |