From c337cfd71c9f5c644b59ecbb8e0582b9cf1edbb9 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 16 Oct 2019 13:04:12 +0200
Subject: [PATCH 01/11] Add share functionnality.
---
src/includes/entrepreneur/resources/detail.pug | 2 ++
src/includes/mentor/resources/detail.pug | 2 ++
src/includes/public/resources/detail.pug | 2 ++
src/includes/share-functionnality.pug | 14 ++++++++++++++
4 files changed, 20 insertions(+)
create mode 100644 src/includes/share-functionnality.pug
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 4fa44af4..95852601 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -94,6 +94,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index cf20f6a7..ecc4fb79 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -94,6 +94,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 84d387e0..5fda4b7a 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -95,6 +95,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/share-functionnality.pug b/src/includes/share-functionnality.pug
new file mode 100644
index 00000000..6c2383b1
--- /dev/null
+++ b/src/includes/share-functionnality.pug
@@ -0,0 +1,14 @@
+.share-functionality
+ p SHARE
+ a(
+ href="#"
+ )
+ i.far.fa-envelope
+ a(
+ href="#"
+ )
+ i.fab.fa-linkedin-in
+ a(
+ href="#"
+ )
+ i.fab.fa-twitter
--
GitLab
From f7e6cc4c4485bd0342c5aeeb8d645a7f0d6cc541 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 24 Oct 2019 11:30:06 +0200
Subject: [PATCH 02/11] shared functionality with basic message.
---
src/includes/components/widgets.pug | 17 ++++++++++++++++-
src/includes/entrepreneur/resources/detail.pug | 13 ++++++++++++-
src/includes/mentor/resources/detail.pug | 14 +++++++++++++-
src/includes/public/resources/detail.pug | 13 ++++++++++++-
src/includes/share-functionnality.pug | 14 --------------
5 files changed, 53 insertions(+), 18 deletions(-)
delete mode 100644 src/includes/share-functionnality.pug
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..5c10ece1 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -163,4 +163,19 @@ sib-widget(name="cs-form-file-custom" )
label(for="preview_image")
sib-form-file(upload-url=`${sdn}upload/` name="preview_image")
-
+sib-widget(name="cs-display-twitter-button" )
+ template
+ a.twitter-share-button(
+ href=`https://twitter.com/intent/tweet?text=Check%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ data-size="large"
+ target='blank'
+ )
+ i.fab.fa-twitter
+
+sib-widget(name="cs-display-email-button" )
+ template
+ a.email-share-button(
+ href=`mailto:?subject=Coopstarter%20shared%20resource
+&body=I%20share%20you%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ )
+ i.far.fa-envelope
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 95852601..1d4d19f5 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -94,7 +94,18 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
sib-display(
bind-resources
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index ecc4fb79..bcfbe72e 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -94,7 +94,19 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
+
sib-display(
bind-resources
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 5fda4b7a..446b2e1c 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -95,7 +95,18 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
sib-display(
bind-resources
diff --git a/src/includes/share-functionnality.pug b/src/includes/share-functionnality.pug
deleted file mode 100644
index 6c2383b1..00000000
--- a/src/includes/share-functionnality.pug
+++ /dev/null
@@ -1,14 +0,0 @@
-.share-functionality
- p SHARE
- a(
- href="#"
- )
- i.far.fa-envelope
- a(
- href="#"
- )
- i.fab.fa-linkedin-in
- a(
- href="#"
- )
- i.fab.fa-twitter
--
GitLab
From 067906de63f15fd2705d36d99cbccb6a8abe70e6 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 16 Oct 2019 13:04:12 +0200
Subject: [PATCH 03/11] Add share functionnality.
---
src/includes/entrepreneur/resources/detail.pug | 2 ++
src/includes/mentor/resources/detail.pug | 2 ++
src/includes/public/resources/detail.pug | 2 ++
src/includes/share-functionnality.pug | 14 ++++++++++++++
4 files changed, 20 insertions(+)
create mode 100644 src/includes/share-functionnality.pug
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 399d29fc..745c4935 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -94,6 +94,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index b978db2a..aa35c4a0 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -95,6 +95,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 5d143464..95c6279c 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -95,6 +95,8 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
+ include ../../share-functionality
+
sib-display(
bind-resources
fields=""
diff --git a/src/includes/share-functionnality.pug b/src/includes/share-functionnality.pug
new file mode 100644
index 00000000..6c2383b1
--- /dev/null
+++ b/src/includes/share-functionnality.pug
@@ -0,0 +1,14 @@
+.share-functionality
+ p SHARE
+ a(
+ href="#"
+ )
+ i.far.fa-envelope
+ a(
+ href="#"
+ )
+ i.fab.fa-linkedin-in
+ a(
+ href="#"
+ )
+ i.fab.fa-twitter
--
GitLab
From e0433b982b027287b67ba03e75ac98d68c58f169 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 24 Oct 2019 11:30:06 +0200
Subject: [PATCH 04/11] shared functionality with basic message.
---
src/includes/components/widgets.pug | 17 ++++++++++++++++-
src/includes/entrepreneur/resources/detail.pug | 13 ++++++++++++-
src/includes/mentor/resources/detail.pug | 14 +++++++++++++-
src/includes/public/resources/detail.pug | 13 ++++++++++++-
src/includes/share-functionnality.pug | 14 --------------
5 files changed, 53 insertions(+), 18 deletions(-)
delete mode 100644 src/includes/share-functionnality.pug
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..5c10ece1 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -163,4 +163,19 @@ sib-widget(name="cs-form-file-custom" )
label(for="preview_image")
sib-form-file(upload-url=`${sdn}upload/` name="preview_image")
-
+sib-widget(name="cs-display-twitter-button" )
+ template
+ a.twitter-share-button(
+ href=`https://twitter.com/intent/tweet?text=Check%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ data-size="large"
+ target='blank'
+ )
+ i.fab.fa-twitter
+
+sib-widget(name="cs-display-email-button" )
+ template
+ a.email-share-button(
+ href=`mailto:?subject=Coopstarter%20shared%20resource
+&body=I%20share%20you%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ )
+ i.far.fa-envelope
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 745c4935..24386b77 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -94,7 +94,18 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
sib-display(
bind-resources
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index aa35c4a0..b9109836 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -95,7 +95,19 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
+
sib-display(
bind-resources
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 95c6279c..fc79429a 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -95,7 +95,18 @@ include ../../components/widgets
counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
)
- include ../../share-functionality
+ p SHARE
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
sib-display(
bind-resources
diff --git a/src/includes/share-functionnality.pug b/src/includes/share-functionnality.pug
deleted file mode 100644
index 6c2383b1..00000000
--- a/src/includes/share-functionnality.pug
+++ /dev/null
@@ -1,14 +0,0 @@
-.share-functionality
- p SHARE
- a(
- href="#"
- )
- i.far.fa-envelope
- a(
- href="#"
- )
- i.fab.fa-linkedin-in
- a(
- href="#"
- )
- i.fab.fa-twitter
--
GitLab
From 952d5b57c6941795690bd4a483c882cb219e3521 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Fri, 15 Nov 2019 10:11:26 +0100
Subject: [PATCH 05/11] inpiration from happy dev web site
---
src/includes/mentor/resources/detail.pug | 12 +++++++-----
src/scripts/coopstarter.js | 5 +++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index b9109836..f93829f9 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -102,11 +102,13 @@ include ../../components/widgets
widget-@id = 'cs-display-email-button'
)
- sib-display.twitter-link(
- bind-resources
- fields="@id"
- widget-@id = 'cs-display-twitter-button'
- )
+ //- sib-display#shareByTwitter.twitter-link.twshare(
+ //- bind-resources
+ //- fields="@id"
+ //- widget-@id = 'cs-display-twitter-button'
+ //- )
+ script(async src="https://platform.twitter.com/widgets.js" charset="utf-8")
+ a(href="", target="_blank")#shareByTwitter.twshare.mdi.mdi-twitter
sib-display(
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index bed5c99e..94b7046b 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -618,6 +618,11 @@ jQuery(document).ready(function($) {
});
}
+ //Manage the twitter button
+ $("#shareByTwitter").on("populate", function (e) {
+ var valUrl = window.location.href;
+ $('.twshare').attr("href", "https://twitter.com/intent/tweet?original_referer=http%3A%2F%2F127.0.0.1%3A3000%2Fevenements&ref_src=twsrc%5Etfw&tw_p=tweetbutton&url=" + valUrl + "&");
+ });
//Manage the logout action
manageLogoutButton();
--
GitLab
From 1c887f4ebee9e245f895bb5901c59f7db49abb9f Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sat, 23 Nov 2019 17:44:28 +0100
Subject: [PATCH 06/11] Fixing footer location
---
src/styles/index.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 44dfb453..4cb69b47 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -768,7 +768,6 @@ footer#footer{
background:var(--bg-block);
height: auto;
box-shadow: 0 2px 10px 0 rgba(0,0,0,0.14);
- position: absolute;
padding-top: 2rem;
bottom: 0;
width: 100%;
--
GitLab
From cdaf075ff46dd51e88ad579494d1726f1616f9c0 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sat, 23 Nov 2019 18:35:39 +0100
Subject: [PATCH 07/11] Harmonizing the rendering of this feature
---
src/includes/components/widgets.pug | 10 ++++-----
src/includes/mentor/resources/detail.pug | 26 +++++++++++-------------
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 5e889adc..10016859 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -153,17 +153,17 @@ sib-widget(name="fake-dislike")
template
p 18 <i class="fas fa-thumbs-down"></i>
-sib-widget(name="accordion-request-resource" )
+sib-widget(name="accordion-request-resource")
template
div
h2 ${value}
-sib-widget(name="cs-form-file-custom" )
+sib-widget(name="cs-form-file-custom")
template
label(for="preview_image")
sib-form-file(upload-url=`${sdn}upload/` name="preview_image")
-sib-widget(name="cs-display-twitter-button" )
+sib-widget(name="cs-display-twitter-button")
template
a.twitter-share-button(
href=`https://twitter.com/intent/tweet?text=Check%20this%20resource%20from%20Coopstarter%20:%20\${value}`
@@ -172,7 +172,7 @@ sib-widget(name="cs-display-twitter-button" )
)
i.fab.fa-twitter
-sib-widget(name="cs-display-email-button" )
+sib-widget(name="cs-display-email-button")
template
a.email-share-button(
href=`mailto:?subject=Coopstarter%20shared%20resource
@@ -180,6 +180,6 @@ sib-widget(name="cs-display-email-button" )
)
i.far.fa-envelope
-sib-widget(name="iframe-video-resource" )
+sib-widget(name="iframe-video-resource")
template
div ${value}
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index be3b63b7..cc1d8ac0 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -95,20 +95,18 @@
//- )
p SHARE
- sib-display.email-link(
- bind-resources
- fields="@id"
- widget-@id = 'cs-display-email-button'
- )
-
- //- sib-display#shareByTwitter.twitter-link.twshare(
- //- bind-resources
- //- fields="@id"
- //- widget-@id = 'cs-display-twitter-button'
- //- )
- script(async src="https://platform.twitter.com/widgets.js" charset="utf-8")
- a(href="", target="_blank")#shareByTwitter.twshare.mdi.mdi-twitter
-
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-@id = 'cs-display-twitter-button'
+ )
+
sib-display(
bind-resources
--
GitLab
From 893818cceeeb32b8e94e3820e97e6170fd64a8f8 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sat, 23 Nov 2019 19:34:43 +0100
Subject: [PATCH 08/11] quick fixes
---
src/includes/entrepreneur/resources/detail.pug | 8 ++++----
src/includes/mentor/resources/detail.pug | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 89660018..6c6b8ac3 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -97,14 +97,14 @@
p SHARE
sib-display.email-link(
bind-resources
- fields="@id"
- widget-@id = 'cs-display-email-button'
+ fields="name"
+ widget-@id='cs-display-email-button'
)
sib-display.twitter-link(
bind-resources
- fields="@id"
- widget-@id = 'cs-display-twitter-button'
+ fields="name"
+ widget-@id='cs-display-twitter-button'
)
sib-display(
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index cc1d8ac0..3a83e8ae 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -98,13 +98,13 @@
sib-display.email-link(
bind-resources
fields="@id"
- widget-@id = 'cs-display-email-button'
+ widget-@id='cs-display-email-button'
)
sib-display.twitter-link(
bind-resources
fields="@id"
- widget-@id = 'cs-display-twitter-button'
+ widget-@id='cs-display-twitter-button'
)
--
GitLab
From 6db7d5a47e0df86cde0730c9da69b3a216d86f0c Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 11 Dec 2019 21:53:22 +0100
Subject: [PATCH 09/11] Share fonctionality works but we still have a pb on the
redirection.
---
src/includes/components/widgets.pug | 7 +++---
src/includes/entrepreneur/dashboard.pug | 6 ++---
.../entrepreneur/resources/detail.pug | 22 +++++++++----------
src/includes/head.pug | 1 +
src/includes/mentor/resources/detail.pug | 5 ++---
src/includes/public/resources/detail.pug | 4 ++--
src/scripts/coopstarter.js | 15 +++++++++++++
7 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 10016859..da14e90a 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -166,17 +166,18 @@ sib-widget(name="cs-form-file-custom")
sib-widget(name="cs-display-twitter-button")
template
a.twitter-share-button(
- href=`https://twitter.com/intent/tweet?text=Check%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ href=``
data-size="large"
target='blank'
+ class='twshare'
)
i.fab.fa-twitter
sib-widget(name="cs-display-email-button")
template
a.email-share-button(
- href=`mailto:?subject=Coopstarter%20shared%20resource
-&body=I%20share%20you%20this%20resource%20from%20Coopstarter%20:%20\${value}`
+ href=``
+ class='emshare'
)
i.far.fa-envelope
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index fcdaf362..a84c072e 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -20,9 +20,9 @@ section#home
include ./resources/list.pug
sib-router
- sib-route(name='entrepreneur-request-create')
- sib-route(name='entrepreneur-request-validation')
- sib-route(name='entrepreneur-resource-detail')
+ sib-route( name='entrepreneur-request-create')
+ sib-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-request-validation', use-id)
+ sib-route(id-prefix=`${endpoints.resources}`, name='entrepreneur-resource-detail', use-id)
dialog#entrepreneur-request-create.no-sidebar.container
include ./requests/create.pug
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 6c6b8ac3..80b1be00 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -95,17 +95,17 @@
//- )
p SHARE
- sib-display.email-link(
- bind-resources
- fields="name"
- widget-@id='cs-display-email-button'
- )
-
- sib-display.twitter-link(
- bind-resources
- fields="name"
- widget-@id='cs-display-twitter-button'
- )
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-id='cs-display-email-button'
+ )
+
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-id='cs-display-twitter-button'
+ )
sib-display(
bind-resources
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 2536f320..d541cdd3 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -9,6 +9,7 @@ head
script(src="https://kit.fontawesome.com/48014d2af3.js")
script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
script(src="/scripts/coopstarter.js")
+ script(async src="https://platform.twitter.com/widgets.js" charset="utf-8")
link(rel="stylesheet" href="/styles/index.css")
script(data-default-context type="application/ld+json" ).
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 3a83e8ae..ecc8aca4 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -98,15 +98,14 @@
sib-display.email-link(
bind-resources
fields="@id"
- widget-@id='cs-display-email-button'
+ widget-id='cs-display-email-button'
)
sib-display.twitter-link(
bind-resources
fields="@id"
- widget-@id='cs-display-twitter-button'
+ widget-id='cs-display-twitter-button'
)
-
sib-display(
bind-resources
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 104939c4..afbfea01 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -98,13 +98,13 @@
sib-display.email-link(
bind-resources
fields="@id"
- widget-@id = 'cs-display-email-button'
+ widget-id = 'cs-display-email-button'
)
sib-display.twitter-link(
bind-resources
fields="@id"
- widget-@id = 'cs-display-twitter-button'
+ widget-id = 'cs-display-twitter-button'
)
sib-display(
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 781b4317..5a943363 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -570,6 +570,21 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXX ON LOAD XXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
jQuery(document).ready(function($) {
+ //Set the share links
+ $(".twitter-link").on("populate", function (e) {
+ var regexMentor = /mentor/g
+ var regexEntrepreneur = /entrepreneur/g
+ var valUrl = window.location.href.replace(regexMentor, 'public').replace(regexEntrepreneur, 'public')
+ $('.twshare').attr("href", "https://twitter.com/intent/tweet?text=Check%20this%20resource%20from%20Coopstarter%20:%20;original_referer=http%3A%2F%2F127.0.0.1%3A3000%2Fevenements&ref_src=twsrc%5Etfw&tw_p=tweetbutton&url=" + valUrl + "&");
+ });
+
+ $(".email-link").on("populate", function (e) {
+ var regexMentor = /mentor/g
+ var regexEntrepreneur = /entrepreneur/g
+ var valUrl = window.location.href.replace(regexMentor, 'public').replace(regexEntrepreneur, 'public')
+ $('.emshare').attr("href", "mailto:?subject=Coopstarter%20shared%20resource&body=I%20share%20you%20this%20resource%20from%20Coopstarter%20:%20" + valUrl);
+ });
+
//Refresh pagination
refreshPagination();
--
GitLab
From 11d7e2ee4615e0838f36e9d35d012c3088da8e21 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 12 Dec 2019 20:15:29 +0100
Subject: [PATCH 10/11] Fixing the inte
---
src/styles/index.scss | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4cb69b47..0d103781 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -434,8 +434,8 @@ p{
}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-.ico_gauche, #mentor-resource-detail a, #mentor-resource-validate a, #entrepreneur-resource-detail a, #entrepreneur-resource-list cs-display-property[name="name"] p,
-#public-resource-detail a{
+.ico_gauche, #mentor-resource-detail cs-display-link a, #mentor-resource-validate cs-display-link a, #entrepreneur-resource-detail cs-display-link a,
+#entrepreneur-resource-list cs-display-property[name="name"] p, #public-resource-detail cs-display-link a{
padding-left: 3.5rem;
position: relative;
}
@@ -472,8 +472,10 @@ header .ico_search:before{
left: 75%;
top: 33%;
}
-#mentor-resource-detail a:before, #mentor-resource-validate a:before, #entrepreneur-resource-detail a:before,#public-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
- content:"\f0c1";
+/* ico link to ressource dans détail ressources*/
+#mentor-resource-detail cs-display-link a:before, #mentor-resource-validate cs-display-link a:before,
+#entrepreneur-resource-detail cs-display-link a:before, #public-resource-detail cs-display-link a:before{
+ content:"\f0c1";
}
.ico_arrow:before{
content: "\f061";
--
GitLab
From 81f90b913fef7155df16c1e0995d27d8cb12c001 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 12 Dec 2019 20:47:00 +0100
Subject: [PATCH 11/11] Fixing some stuff
---
.../entrepreneur/resources/detail.pug | 2 +-
src/includes/mentor/resources/detail.pug | 2 +-
src/includes/public/resources/detail.pug | 29 ++++++++++---------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index b0c4be0a..6469a8c5 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -116,7 +116,7 @@
sib-conversation(
bind-resources
- id-suffix="conversations"
+ nested-field="conversations"
)
h2.title_lead_avenir=`${data.RelatedResources}`
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index ecc8aca4..17831929 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -116,7 +116,7 @@
sib-conversation(
bind-resources
- id-suffix="conversations"
+ nested-field="conversations"
)
h2.title_lead_avenir=`${data.RelatedResources}`
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index afbfea01..2219535c 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -67,7 +67,7 @@
label-skills=`${data.WithThisResourceBeAbleTo}`
label-uri=`${data.LinkToResource}`
name-uri='original-link'
- label-country=`${data.Country}`
+ label-country.name=`${data.Country}`
label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
label-author=`${data.Author}`
label-submitter.name=`${data.ResourcePostedBy}`
@@ -94,29 +94,30 @@
//- counter-template="<p><i class='fas fa-thumbs-down'></i>${counter}</p>"
//- )
- p SHARE
- sib-display.email-link(
- bind-resources
- fields="@id"
- widget-id = 'cs-display-email-button'
- )
+ p SHARE
+
+ sib-display.email-link(
+ bind-resources
+ fields="@id"
+ widget-id = 'cs-display-email-button'
+ )
- sib-display.twitter-link(
- bind-resources
- fields="@id"
- widget-id = 'cs-display-twitter-button'
- )
+ sib-display.twitter-link(
+ bind-resources
+ fields="@id"
+ widget-id = 'cs-display-twitter-button'
+ )
sib-display(
bind-resources
fields=""
nested-field="conversations"
- counter-template=`<p>${data.Comments} (${counter})</p>`
+ counter-template=`<p>${data.Comments} (\${counter})</p>`
)
sib-conversation(
bind-resources
- id-suffix="conversations"
+ nested-field="conversations"
)
h2.title_lead_avenir=`${data.RelatedResources}`
--
GitLab