From c45fc8ac005616cd9d1baa5687c9c3d8b4c15fdb Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 00:19:49 +0200 Subject: changed loginbutton for facebook/twitter --- views/navbar.ejs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'views') diff --git a/views/navbar.ejs b/views/navbar.ejs index 6bc2bbe..c432055 100644 --- a/views/navbar.ejs +++ b/views/navbar.ejs @@ -6,10 +6,10 @@
<% if (!loggedin) { %> -- cgit v1.2.3 From f93cd061359f9060976d8209a0cc37d42b295edf Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 09:09:55 +0200 Subject: working with project listing --- views/dashboard.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'views') diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 5eca9f1..a1f625a 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -12,10 +12,11 @@

Prosjekter

+ <% projects.forEach(function(project) { %>
-

dennisse/hytteturskogentilfrank

+

dennisse/<%= project.name %>

Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine @@ -30,6 +31,7 @@
+ <% }); %>
-- cgit v1.2.3 From 305e189956e8c4834300c8b5b38509590e70be7f Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 12:16:39 +0200 Subject: changes in divid home and use.less --- views/home.ejs | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'views') diff --git a/views/home.ejs b/views/home.ejs index 7884df8..2539f2a 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -78,7 +78,6 @@

Parforhold

I etableringsfasen som ønsker å ha ordnet økonomi fra starten av

-

Hindrer snylting

@@ -88,11 +87,6 @@

Hvem betaler hva for hans, hennes og deres barn?

-
@@ -122,20 +116,15 @@

Registrering

"Her skal registreringsformen inn"

-

Divid er enkelt!

- -- cgit v1.2.3 From afd9ee0713c1f6deca72d7223d8cbe178e45831e Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 12:24:59 +0200 Subject: made the dashboard list actice projects --- views/dashboard.ejs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'views') diff --git a/views/dashboard.ejs b/views/dashboard.ejs index a1f625a..66dfa80 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -12,26 +12,26 @@

Prosjekter

- <% projects.forEach(function(project) { %> -
-
-
-

dennisse/<%= project.name %>

-
-
- Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine -
-
- Oppgjør: -200 kr + <% projects.forEach(function(projects) { %> +
+
+
+

<%= projects.project.user.username %>/<%= projects.project.name %>

+
+
+ Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine +
+
+ Oppgjør: -200 kr +
+
+

+

+
-
-

+

-
-
-
- <% }); %> +
+ <% }); %>
-- cgit v1.2.3 From c0630c6db730ba50ab247435bff14a36a4303e93 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 13:28:45 +0200 Subject: added shorturl for projects --- views/dashboard.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views') diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 66dfa80..dfd76f6 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -16,7 +16,7 @@
-

<%= projects.project.user.username %>/<%= projects.project.name %>

+

<%= projects.project.user.username %>/<%= projects.project.name %>

Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine -- cgit v1.2.3 From c505aaa0e21f7e0b11f8cb384ddd613fa3669014 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 14:37:10 +0200 Subject: made a page for adding participants to projects --- views/projectParticipants.ejs | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 views/projectParticipants.ejs (limited to 'views') diff --git a/views/projectParticipants.ejs b/views/projectParticipants.ejs new file mode 100644 index 0000000..3af9c10 --- /dev/null +++ b/views/projectParticipants.ejs @@ -0,0 +1,55 @@ +<% include header %> + + + + <% include navbar %> + + +
+
+ + +
+
+ +

<%= title %>

+

Her kan du invitere venner til å delta i prosjektet ditt. Skriv inn eposadressene deres, en på hver linje, i tekstboksen under.

+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+
+ + + + + + + +
+
+ + +<% include footer %> + + -- cgit v1.2.3 From 67172b7b82a2e36b101f371a608abdab7dac91bb Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 14:40:30 +0200 Subject: Added img and new sub html contact.ejs --- views/contact.ejs | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 views/contact.ejs (limited to 'views') diff --git a/views/contact.ejs b/views/contact.ejs new file mode 100644 index 0000000..bf43f1c --- /dev/null +++ b/views/contact.ejs @@ -0,0 +1,73 @@ +<% include header %> + + + + + + <% include navbar %> + + +
+
+ +
+
+
+

Kontakt oss

+

Support

+

Se gjerne igjennom vår faq - ofte stilte spørsmål - før dere sender mail på support(a)divid.no . +

Business

+

Ønsker du å kontakte oss for kjøp av annonseplass, forretninger og lignende ta kontakt på pr(a)divid.no.

+
+
+

Om teamet DERS

+
+

Dennis Eriksen

+ +

Alder:

+

Ifra:Skien

+

Mobil:

+

Fokus:

+

Favoritt ting:Unicorns

+

+
+

Erling Aaby

+ +

Alder:

+

Ifra:Oslo

+

Mobil:

+

Fokus:

+

Favoritt ting:trening

+

+
+

Robert Joramo

+ +

Alder:

+

Ifra:Årnes

+

Mobil:

+

Fokus:

+

Favoritt ting:Fopal

+

+
+

Stian Olsen

+ +

Alder:

+

Ifra:Trondheim

+

Mobil:

+

Fokus:

+

Favoritt ting:Korboi <3

+

+
+
+
+
+
+ +<% include footer %> + + \ No newline at end of file -- cgit v1.2.3 From e3170f61056cadd493b32c249f5a00b5d7996229 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 14:45:44 +0200 Subject: added testlink --- views/project.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views') diff --git a/views/project.ejs b/views/project.ejs index 4bee9fd..e9978d5 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -35,7 +35,7 @@ Robert Joramo
Dennis Eriksen
Helene Apelort
- Legg til flere deltakere + Legg til flere deltakere
-- cgit v1.2.3