From f28d8f4aac3f6411d43ac81a70bfebe5e61e96c7 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Sat, 7 Jun 2014 04:50:31 -0400 Subject: arrange edit project/profile modals --- views/edit-profile.ejs | 83 ---------------------------- views/partials/edit-profile.ejs | 67 ++++++++++++++++++++++ views/partials/header.ejs | 1 + views/partials/newproject.ejs | 18 ------ views/partials/scripts.ejs | 3 + views/partials/signin.ejs | 4 ++ views/profile.ejs | 113 +++++++++----------------------------- views/projects/create-project.ejs | 18 ++++++ views/projects/edit-project.ejs | 52 ++++++++++++++++++ views/projects/list-projects.ejs | 19 +++++++ 10 files changed, 189 insertions(+), 189 deletions(-) delete mode 100644 views/edit-profile.ejs create mode 100644 views/partials/edit-profile.ejs delete mode 100644 views/partials/newproject.ejs create mode 100644 views/projects/create-project.ejs create mode 100644 views/projects/edit-project.ejs create mode 100644 views/projects/list-projects.ejs (limited to 'views') diff --git a/views/edit-profile.ejs b/views/edit-profile.ejs deleted file mode 100644 index 0e39ade..0000000 --- a/views/edit-profile.ejs +++ /dev/null @@ -1,83 +0,0 @@ - - - - vvalls - [[ include partials/meta ]] - - -
- - -
- -
- -
    -
  • -

    Edit Profile

    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -

    please choose a picture at least 500px wide

    -
    • -
  • -

    Edit Password

    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • - -
  • - -
    • -
-
-
- -[[ include partials/footer ]] - -
- -[[ include partials/scripts ]] - diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs new file mode 100644 index 0000000..1ac69d7 --- /dev/null +++ b/views/partials/edit-profile.ejs @@ -0,0 +1,67 @@ +
+ X +
+ +
+ +
    +
  • +

    Edit Profile

    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +

    please choose a picture at least 500px wide

    +
    • +
  • +

    Edit Password

    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • + +
  • + +
    • +
+
\ No newline at end of file diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 4ba9773..fce96cc 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -4,6 +4,7 @@ [[ if (logged_in) { ]] [[- user.displayName ]] View Profile + Edit Profile Sign Out [[ } else { ]] diff --git a/views/partials/newproject.ejs b/views/partials/newproject.ejs deleted file mode 100644 index fc34295..0000000 --- a/views/partials/newproject.ejs +++ /dev/null @@ -1,18 +0,0 @@ -
- X -
- -
-

Choose Room Template

- - - - - - -
-
- -
-
-
\ No newline at end of file diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 46c5d50..c8f65f6 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -47,5 +47,8 @@ + + + diff --git a/views/partials/signin.ejs b/views/partials/signin.ejs index c285811..3341aec 100644 --- a/views/partials/signin.ejs +++ b/views/partials/signin.ejs @@ -1,3 +1,5 @@ +[[ if (! logged_in) { ]] + + +[[ } ]] diff --git a/views/profile.ejs b/views/profile.ejs index 5ac75c5..26f1ee1 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -6,109 +6,46 @@
- - edit profile + [[- include partials/header ]] + [[ if (profile.photo && profile.photo.length) { ]] + + [[ } else { ]] + [[ } ]]
+ - -

Ivan Sidorov

+

[[- profile.displayName ]]

+ [[ if (profile.location) { ]] + + [[- profile.location ]] + + [[ } ]] + [[ if (profile.website && profile.website.length) { ]] + + [[- profile.website ]] + + [[ } ]] + [[ if (profile.twitterName && profile.twitterName.length) { ]] - New York City · http://example.com/ · @twitter + @[[- profile.twitterName ]] + [[ } ]]
-

Ivan has 4 projects

- - - - - - - -
-
edit
-
- X -
-
-
    -
  • -

    Edit Room

    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - -
    -
    • -
  • - -
    - - - - - -
    -
    • -
  • - + [[ include projects/list-projects ]] - -
    • -
    -
  • - Clone Project - Delete Project -
    • -
-
-
-
- Idea for Show - 		-
edit
- Thing I'm Working On - 		-
edit
- Pace Gallery -
- - - - - -
-
edit
- Pace Gallery -
- - create project + create project + [[ include partials/edit-profile ]] + [[ include projects/create-project ]] + [[ include projects/edit-project ]] [[ include partials/footer ]]
diff --git a/views/projects/create-project.ejs b/views/projects/create-project.ejs new file mode 100644 index 0000000..e151f3a --- /dev/null +++ b/views/projects/create-project.ejs @@ -0,0 +1,18 @@ +
+ X +
+ +
+

Choose Room Template

+ + + + + + +
+
+ +
+
+
diff --git a/views/projects/edit-project.ejs b/views/projects/edit-project.ejs new file mode 100644 index 0000000..0441b9f --- /dev/null +++ b/views/projects/edit-project.ejs @@ -0,0 +1,52 @@ +
+ X +
+
+
    +
  • +

    Edit Room

    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + +
    +
    • +
  • + +
    + + + + + +
    +
    • +
  • + +
    • +
    +
  • + Clone Project + Delete Project +
    • +
+
+
+
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs new file mode 100644 index 0000000..4e5be75 --- /dev/null +++ b/views/projects/list-projects.ejs @@ -0,0 +1,19 @@ +[[ if (projects.length) { ]] +

[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 && "s" ]]

+ + + + + [[ projects.forEach(function(project) { ]] + + [[ }) ]] + + +
+ [[ if (profile._id == project.user_id) { ]] +
edit
+ [[ } ]] + [[- project.name ]] +
+ +[[ } ]] -- cgit v1.2.3-70-g09d2