From b4fd7ddd7cf6fb2a68613bc0257a650055360ea7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 9 Jun 2014 17:41:00 -0400 Subject: environment working again --- views/app.ejs | 29 ---------- views/builder.ejs | 43 +++++++++++++++ views/controls/builder/toolbar.ejs | 9 ++++ views/controls/editor/light-control.ejs | 18 +++++++ views/controls/editor/media-drawer.ejs | 96 +++++++++++++++++++++++++++++++++ views/controls/editor/settings.ejs | 40 ++++++++++++++ views/controls/editor/signed-out.ejs | 14 +++++ views/controls/editor/toolbar.ejs | 9 ++++ views/controls/editor/video-toolbar.ejs | 7 +++ views/controls/editor/wallpaper.ejs | 10 ++++ views/controls/light-control.ejs | 18 ------- views/controls/media-drawer.ejs | 96 --------------------------------- views/controls/settings.ejs | 40 -------------- views/controls/signed-out.ejs | 14 ----- views/controls/toolbar.ejs | 9 ---- views/controls/video-toolbar.ejs | 7 --- views/controls/wallpaper.ejs | 10 ---- views/editor.ejs | 28 ++++++++++ views/partials/footer.ejs | 2 +- views/staff.ejs | 4 +- 20 files changed, 278 insertions(+), 225 deletions(-) delete mode 100755 views/app.ejs create mode 100644 views/builder.ejs create mode 100644 views/controls/builder/toolbar.ejs create mode 100644 views/controls/editor/light-control.ejs create mode 100644 views/controls/editor/media-drawer.ejs create mode 100644 views/controls/editor/settings.ejs create mode 100644 views/controls/editor/signed-out.ejs create mode 100644 views/controls/editor/toolbar.ejs create mode 100644 views/controls/editor/video-toolbar.ejs create mode 100644 views/controls/editor/wallpaper.ejs delete mode 100644 views/controls/light-control.ejs delete mode 100644 views/controls/media-drawer.ejs delete mode 100644 views/controls/settings.ejs delete mode 100644 views/controls/signed-out.ejs delete mode 100644 views/controls/toolbar.ejs delete mode 100644 views/controls/video-toolbar.ejs delete mode 100644 views/controls/wallpaper.ejs create mode 100755 views/editor.ejs (limited to 'views') diff --git a/views/app.ejs b/views/app.ejs deleted file mode 100755 index 4a10915..0000000 --- a/views/app.ejs +++ /dev/null @@ -1,29 +0,0 @@ - - - - vvalls - [[ include partials/meta ]] - - - -
- -
- - - - [[ include controls/toolbar ]] - [[ include controls/video-toolbar ]] - [[ include controls/media-drawer ]] - [[ include controls/wallpaper ]] - [[ include controls/light-control ]] - [[ include controls/settings ]] - -
- -
-
- - -[[ include partials/scripts ]] - diff --git a/views/builder.ejs b/views/builder.ejs new file mode 100644 index 0000000..50b2a5b --- /dev/null +++ b/views/builder.ejs @@ -0,0 +1,43 @@ + + + + vvalls + [[ include partials/meta ]] + + + +
+ +
+ [[ include partials/header ]] + [[ include controls/builder/toolbar ]] + + + +
+
+
+ +
+ +
+
+
+ +
+ + +[[ include partials/scripts ]] + diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs new file mode 100644 index 0000000..1bf87eb --- /dev/null +++ b/views/controls/builder/toolbar.ejs @@ -0,0 +1,9 @@ +
+ + + + + + + +
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs new file mode 100644 index 0000000..782c400 --- /dev/null +++ b/views/controls/editor/light-control.ejs @@ -0,0 +1,18 @@ +
+
+ +

Outline Hue

+
+
+ +

Wall Hue

+
+
+ +

Brightness

+
+
+ +

Shadow

+
+
\ No newline at end of file diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs new file mode 100644 index 0000000..af9ea71 --- /dev/null +++ b/views/controls/editor/media-drawer.ejs @@ -0,0 +1,96 @@ + +
+
+ Upload File + +
+ ~ or ~
+ + + +
+
+ +
+ +
+

Your Media – Found Media


+

delete media

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs new file mode 100644 index 0000000..f92d1c7 --- /dev/null +++ b/views/controls/editor/settings.ejs @@ -0,0 +1,40 @@ +
+ +
+ + + Select Startpoint + Move to Desired Point +
+ +
+ +
+ +
+ +
+
+ +
+
+
+ + + + +
+
+
+ +
+
+ Clone + Clear + Delete +
+
\ No newline at end of file diff --git a/views/controls/editor/signed-out.ejs b/views/controls/editor/signed-out.ejs new file mode 100644 index 0000000..20e3715 --- /dev/null +++ b/views/controls/editor/signed-out.ejs @@ -0,0 +1,14 @@ +Sign Up +Sign In + +
+

Roomname, Ivan Sidorov

+

Last modified 3/12/14

+ Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. +
+ +
+

Share this on–

+ Facebook + Twitter +
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs new file mode 100644 index 0000000..1bf87eb --- /dev/null +++ b/views/controls/editor/toolbar.ejs @@ -0,0 +1,9 @@ +
+ + + + + + + +
diff --git a/views/controls/editor/video-toolbar.ejs b/views/controls/editor/video-toolbar.ejs new file mode 100644 index 0000000..d4364a2 --- /dev/null +++ b/views/controls/editor/video-toolbar.ejs @@ -0,0 +1,7 @@ +
+ + + + + +
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs new file mode 100644 index 0000000..82460b7 --- /dev/null +++ b/views/controls/editor/wallpaper.ejs @@ -0,0 +1,10 @@ +
+ + + + + + + + +
\ No newline at end of file diff --git a/views/controls/light-control.ejs b/views/controls/light-control.ejs deleted file mode 100644 index 782c400..0000000 --- a/views/controls/light-control.ejs +++ /dev/null @@ -1,18 +0,0 @@ -
-
- -

Outline Hue

-
-
- -

Wall Hue

-
-
- -

Brightness

-
-
- -

Shadow

-
-
\ No newline at end of file diff --git a/views/controls/media-drawer.ejs b/views/controls/media-drawer.ejs deleted file mode 100644 index af9ea71..0000000 --- a/views/controls/media-drawer.ejs +++ /dev/null @@ -1,96 +0,0 @@ - -
-
- Upload File - -
- ~ or ~
- - - -
-
- -
- -
-

Your Media – Found Media


-

delete media

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
\ No newline at end of file diff --git a/views/controls/settings.ejs b/views/controls/settings.ejs deleted file mode 100644 index f92d1c7..0000000 --- a/views/controls/settings.ejs +++ /dev/null @@ -1,40 +0,0 @@ -
- -
- - - Select Startpoint - Move to Desired Point -
- -
- -
- -
- -
-
- -
-
-
- - - - -
-
-
- -
-
- Clone - Clear - Delete -
-
\ No newline at end of file diff --git a/views/controls/signed-out.ejs b/views/controls/signed-out.ejs deleted file mode 100644 index 20e3715..0000000 --- a/views/controls/signed-out.ejs +++ /dev/null @@ -1,14 +0,0 @@ -Sign Up -Sign In - -
-

Roomname, Ivan Sidorov

-

Last modified 3/12/14

- Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. -
- -
-

Share this on–

- Facebook - Twitter -
diff --git a/views/controls/toolbar.ejs b/views/controls/toolbar.ejs deleted file mode 100644 index 1bf87eb..0000000 --- a/views/controls/toolbar.ejs +++ /dev/null @@ -1,9 +0,0 @@ -
- - - - - - - -
diff --git a/views/controls/video-toolbar.ejs b/views/controls/video-toolbar.ejs deleted file mode 100644 index d4364a2..0000000 --- a/views/controls/video-toolbar.ejs +++ /dev/null @@ -1,7 +0,0 @@ -
- - - - - -
diff --git a/views/controls/wallpaper.ejs b/views/controls/wallpaper.ejs deleted file mode 100644 index 82460b7..0000000 --- a/views/controls/wallpaper.ejs +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - - - - - -
\ No newline at end of file diff --git a/views/editor.ejs b/views/editor.ejs new file mode 100755 index 0000000..889200c --- /dev/null +++ b/views/editor.ejs @@ -0,0 +1,28 @@ + + + + vvalls + [[ include partials/meta ]] + + + +
+ +
+ [[ include partials/header ]] + + [[ include controls/editor/toolbar ]] + [[ include controls/editor/video-toolbar ]] + [[ include controls/editor/media-drawer ]] + [[ include controls/editor/wallpaper ]] + [[ include controls/editor/light-control ]] + [[ include controls/editor/settings ]] + +
+ +
+
+ + +[[ include partials/scripts ]] + diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 1df179a..703dab4 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -12,7 +12,7 @@ you are signed in as → - [[- user.displayName ]] + [[- user.displayName ]] Sign Out? [[ } ]] diff --git a/views/staff.ejs b/views/staff.ejs index f099edb..bc07bc2 100644 --- a/views/staff.ejs +++ b/views/staff.ejs @@ -8,7 +8,9 @@
[[ include partials/header ]] - [[ include staff/edit-docs ]] + - recent users + - rooms list + - projects list [[ include partials/footer ]]
-- cgit v1.2.3-70-g09d2