From 9563b3b61ee33d0948a1b729398d82c2db14c3b8 Mon Sep 17 00:00:00 2001 From: Gustavo Vera Scuderi Date: Sun, 8 Oct 2017 00:15:35 -0300 Subject: [PATCH 01/28] Partial progress for issue #828 Signed-off-by: Gustavo Vera Scuderi --- app/css/app.css | 2 +- app/v2/mockups/dashboard.html | 6 +- ...tml => contribution-detail-modal-old.html} | 0 .../directives/contribution-detail.html | 71 +++++++ .../directives/discussion-panel-old.html | 194 +++++++++++------- .../partials/directives/discussion-panel.html | 88 ++++---- app/v2/stylesheets/discussion-panel.scss | 68 +++++- app/v2/stylesheets/main.scss | 2 +- 8 files changed, 307 insertions(+), 124 deletions(-) rename app/v2/partials/directives/{contribution-detail-modal.html => contribution-detail-modal-old.html} (100%) create mode 100644 app/v2/partials/directives/contribution-detail.html diff --git a/app/css/app.css b/app/css/app.css index 0f6ea557..ade7ebaa 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2825,7 +2825,7 @@ i { .section .icon-circle-number { font-size: 2em; font-weight: 700; - line-height: 0.57143em; + line-height: 0.5714285714em; text-align: center; color: #FFFFFF; margin: 15px 0px 0px -30px; diff --git a/app/v2/mockups/dashboard.html b/app/v2/mockups/dashboard.html index eabaa5f6..fcea9948 100644 --- a/app/v2/mockups/dashboard.html +++ b/app/v2/mockups/dashboard.html @@ -201,11 +201,11 @@

{{ 'Comments' | translate}}

-
    +
    {{ 'Comments' | translate}} endpoint-id="campaign.uuid" endpoint="campaign" public-board="true" is-anonymous="isAnonymous">
    -
+ diff --git a/app/v2/partials/directives/contribution-detail-modal.html b/app/v2/partials/directives/contribution-detail-modal-old.html similarity index 100% rename from app/v2/partials/directives/contribution-detail-modal.html rename to app/v2/partials/directives/contribution-detail-modal-old.html diff --git a/app/v2/partials/directives/contribution-detail.html b/app/v2/partials/directives/contribution-detail.html new file mode 100644 index 00000000..e1a562a3 --- /dev/null +++ b/app/v2/partials/directives/contribution-detail.html @@ -0,0 +1,71 @@ + +
+
+

+ + {{theme.title}} + , + +

+
+

+ {{contribution.title}} +

+
+ +
+ + {{author.name}}{{!$last ? ', ' : ''}} +
+
+ +
+
+
+

+ + + +
+
+ +
+
+ + +
+
+
+
+
diff --git a/app/v2/partials/directives/discussion-panel-old.html b/app/v2/partials/directives/discussion-panel-old.html index 87f88409..d6eeb6b2 100644 --- a/app/v2/partials/directives/discussion-panel-old.html +++ b/app/v2/partials/directives/discussion-panel-old.html @@ -1,89 +1,131 @@ -
-
-

{{'Conversations' | translate}}

-

 {{'Start a new conversation' | translate}}

-
-
  • -
    - -

    {{formatDate(discussion.creation)}}

    -
    - +
    + + + + -
    - {{discussion.text}} -
    -
    -
    -
    - +{{discussion.stats.ups}} -
    -
    - -{{discussion.stats.downs}} -
    -
    - {{discussion.comments.length || 0}} {{'Replies' | translate}} -  {{'Reply to this comment' | translate}} -
    - - -
    -

    {{'Reply' | translate}}

    - -
    -
    - +
    +
    + +
    -
    - +
    +
    +
    + + +
    -
    -
    • -

    {{'no.discussion.message' | translate}}

    -
    + -
    -

    {{'Start a Conversation' | translate}}

    -
    -
    -
    - +
    +
  • +
    + +
    +
    +

    {{formatDate(discussion.creation)}}

    +
    +
    + +
    - + + + + +
    +
    +

    {{discussion.text}}

    +
    +
    + +  {{'Reply to this comment' | translate}}   +
    +
      +
    • + +
      +
      +

      {{formatDate(comment.creation)}}

      +
      +
      + +
      +
      +
      + + + +

      +
      +
      +

      {{comment.text}}

      +
      + +
      • +
    + +
    +

    {{'Reply' | translate}}

    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    + +
    - -
    • - -
    + + +

    {{'no.discussion.message' | translate}}

    + + diff --git a/app/v2/partials/directives/discussion-panel.html b/app/v2/partials/directives/discussion-panel.html index d6eeb6b2..eec81581 100644 --- a/app/v2/partials/directives/discussion-panel.html +++ b/app/v2/partials/directives/discussion-panel.html @@ -3,10 +3,21 @@ +
    +
    + Comments ({{discussions.length}}) +
    +
    + View comments by: + +
    +
    - -
    +
    @@ -22,42 +33,35 @@
    -
    -
    -
    -
    - - -
    -
    -
    +
    -
  • +
  • -
    -

    {{formatDate(discussion.creation)}}

    +
    + + + +
    -
    + +
    -
    - - - - -

    {{discussion.text}}

    @@ -66,22 +70,23 @@  {{'Reply to this comment' | translate}}  
      -
    • +
    • -
      -

      {{formatDate(comment.creation)}}

      -
      -
      - -
      -
      -
      - - - -

      +
      + + + + +
      + +
      + +

      {{comment.text}}

      @@ -92,8 +97,8 @@
    -
    -

    {{'Reply' | translate}}

    +
    +

    {{'Reply' | translate}}

    @@ -110,14 +115,13 @@

    {{'Reply' | translate}}

    -

    - - +
    diff --git a/app/v2/stylesheets/discussion-panel.scss b/app/v2/stylesheets/discussion-panel.scss index 8fa58a68..58f4d8b8 100644 --- a/app/v2/stylesheets/discussion-panel.scss +++ b/app/v2/stylesheets/discussion-panel.scss @@ -74,4 +74,70 @@ discussion-panel { .reply-count{ float: right; margin-right: 1em; -} \ No newline at end of file +} + + +.comments__section { + + .comments-header { + padding: 2rem 0 1rem; + strong { font-weight: bold; } + } + + .comments__listing { + margin-top: 90px; + } + + .conversation-container { + border: 1px solid #a5a5a5; + box-shadow: inset 0px 0px 2px rgba(0, 0, 0, 0.25); + padding: 0 1rem 0 0; + } + + .threaded-comments .comment-container { + border: none; + border-top: 1px solid #a5a5a5; + + .user__card .avatar_link { + font-style: normal; + font-weight: bold; + } + } + + .comment-text { + font-size: 1rem; + } + + .user__card { + margin-bottom: 1rem; + height: 3em; + figure, img { + width: 2.5em; + height: 2.5em; + } + .fn { + margin-top: -0.5rem; + span { + display: block; + font-size: 0.8rem; + margin-top: -0.2rem; + } + } + } + + .threaded-comments { + padding-right: 0; + padding-bottom: 1rem; + } + + .comments__reply { + h3 { font-weight: bold; } + .comments__listing { + margin-top: 0; + } + &.new { + padding-left: 1rem; + } + } + + } \ No newline at end of file diff --git a/app/v2/stylesheets/main.scss b/app/v2/stylesheets/main.scss index cb761f93..ac05b324 100644 --- a/app/v2/stylesheets/main.scss +++ b/app/v2/stylesheets/main.scss @@ -1187,7 +1187,7 @@ custom-field { @import "../components/breadcrumb/breadcrumb"; @import "../components/core/topbar-notifications/topbar-notifications"; // Uncomment this to test the discussion panel -//@import "../mockups/discussion-panel.scss"; +// @import "../mockups/discussion-panel.scss"; // Uncomment this to test the profile updates //@import "../mockups/profile.scss"; @import "../mockups/voting-summary-proposal-page"; From c99e0b1df3533640abfc424af31b5de85fbe2fdb Mon Sep 17 00:00:00 2001 From: Gustavo Vera Scuderi Date: Mon, 9 Oct 2017 23:43:04 -0300 Subject: [PATCH 02/28] Added model for detecting change in comment type Signed-off-by: Gustavo Vera Scuderi --- app/v2/directives/discussion-panel.js | 9 ++ ...il.html => contribution-detail-modal.html} | 0 .../directives/discussion-panel-content.html | 116 ++++++++++++++++++ .../partials/directives/discussion-panel.html | 2 +- 4 files changed, 126 insertions(+), 1 deletion(-) rename app/v2/partials/directives/{contribution-detail.html => contribution-detail-modal.html} (100%) create mode 100644 app/v2/partials/directives/discussion-panel-content.html diff --git a/app/v2/directives/discussion-panel.js b/app/v2/directives/discussion-panel.js index 2b73def9..f38958c5 100644 --- a/app/v2/directives/discussion-panel.js +++ b/app/v2/directives/discussion-panel.js @@ -40,6 +40,7 @@ scope.user = localStorageService.get('user'); scope.validateCaptchaResponse = validateCaptchaResponse.bind(scope); scope.setCaptchaResponse = setCaptchaResponse.bind(scope); + scope.vm['commentType'] = 'public'; if (scope.user) { var hasRol = Memberships.hasRol; @@ -63,6 +64,14 @@ } }); } + + scope.$watch('vm.commentType', function(value) { + if (value == 'public') { + scope.showCommentType = 'public'; + } else { + scope.showCommentType = 'members'; + } + }); loadDiscussions(scope, scope.spaceId); scope.newDiscussion = initContribution('DISCUSSION'); scope.newComment = initContribution('COMMENT'); diff --git a/app/v2/partials/directives/contribution-detail.html b/app/v2/partials/directives/contribution-detail-modal.html similarity index 100% rename from app/v2/partials/directives/contribution-detail.html rename to app/v2/partials/directives/contribution-detail-modal.html diff --git a/app/v2/partials/directives/discussion-panel-content.html b/app/v2/partials/directives/discussion-panel-content.html new file mode 100644 index 00000000..b4406b96 --- /dev/null +++ b/app/v2/partials/directives/discussion-panel-content.html @@ -0,0 +1,116 @@ +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    + +
    +
  • +
    + +
    +
    + + + + +
    + +
    + +
    +
    +
    +

    {{discussion.text}}

    +
    +
    + +  {{'Reply to this comment' | translate}}   +
    +
      +
    • + +
      +
      + + + + +
      + +
      + +
      +
      +
      +

      {{comment.text}}

      +
      + +
      • +
    + +
    +

    {{'Reply' | translate}}

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

    {{'no.discussion.message' | translate}}

    +
    \ No newline at end of file diff --git a/app/v2/partials/directives/discussion-panel.html b/app/v2/partials/directives/discussion-panel.html index eec81581..1b093e16 100644 --- a/app/v2/partials/directives/discussion-panel.html +++ b/app/v2/partials/directives/discussion-panel.html @@ -9,7 +9,7 @@
    View comments by: - From 1a2e3fc793b52718bcd933cb6cd7b48c743782df Mon Sep 17 00:00:00 2001 From: Gustavo Vera Scuderi Date: Mon, 16 Oct 2017 02:15:38 -0300 Subject: [PATCH 03/28] Added toolbar for contribution page refs socialappslab/appcivist-pb-client#852 Signed-off-by: Gustavo Vera Scuderi --- app/css/app.css | 2 +- app/v2/controllers/contribution/page.js | 7 +- app/v2/partials/contribution/page.html | 119 +++++++++++++++--------- app/v2/stylesheets/page_header.scss | 24 +++++ 4 files changed, 106 insertions(+), 46 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 0f6ea557..ade7ebaa 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2825,7 +2825,7 @@ i { .section .icon-circle-number { font-size: 2em; font-weight: 700; - line-height: 0.57143em; + line-height: 0.5714285714em; text-align: center; color: #FFFFFF; margin: 15px 0px 0px -30px; diff --git a/app/v2/controllers/contribution/page.js b/app/v2/controllers/contribution/page.js index 5d0a4d78..f25e11ff 100644 --- a/app/v2/controllers/contribution/page.js +++ b/app/v2/controllers/contribution/page.js @@ -506,7 +506,8 @@ } res.$promise.then(function (data) { $scope.resources = data; - loadPictureResources() + loadPictureResources(); + loadDocuments(); }, function(error) { Notify.show('Error while trying to fetch resources', 'error'); }); @@ -523,6 +524,10 @@ } } + function loadDocuments() { + $scope.documents = $scope.resources.filter(resource => resource.resourceType !== 'PICTURE' && resource.resourceType !== 'VIDEO'); + } + function loadCampaignConfig() { if ($scope.campaign && $scope.campaign.rsID) { var rsp = Campaigns.getConfiguration($scope.campaign.rsID).get(); diff --git a/app/v2/partials/contribution/page.html b/app/v2/partials/contribution/page.html index 887f89eb..fa471dd6 100644 --- a/app/v2/partials/contribution/page.html +++ b/app/v2/partials/contribution/page.html @@ -261,52 +261,50 @@

    {{proposal.title}}

    -
    -
    -
    +
    @@ -521,6 +519,39 @@

    {{ 'Comments' | translate}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -487,12 +324,17 @@

    {{contributionType|titlecase|translate}}

    {{ 'Attachments' | translate }}

    +
    +
    + + diff --git a/app/v2/partials/contribution/page.scss b/app/v2/partials/contribution/page.scss new file mode 100644 index 00000000..7a066a67 --- /dev/null +++ b/app/v2/partials/contribution/page.scss @@ -0,0 +1,160 @@ +.page__header a { + text-decoration: none; +} + +.action-bar .action-button { + margin-top: 10px; +} + +.action-button svg g { + fill: #11493b; +} + +.campaign_cards .attachments { + float: left; +} + +.campaign_cards .attachments-shrinked { + width: 60%; +} + +.campaign_cards .list--ideas { + left: 0; +} + +.nav-tabs { + border-bottom: 1px solid #c6c8cb; +} + +.nav-tabs>li { + float: left; + margin-bottom: -1px; +} + +.nav-tabs>li>a { + margin-right: 2px; + line-height: 1.42857143; + border: 1px solid transparent; + border-radius: 4px 4px 0 0; + color: #555; + text-decoration: none; +} + +.nav-tabs>li>a:hover { + border-color: #eeeeee #eeeeee #c6c8cb; + background-color: #e6e7e8; +} + +.nav-tabs>li.active>a, +.nav-tabs>li.active>a:hover, +.nav-tabs>li.active>a:focus { + color: #555555; + background-color: #e6e7e8; + border: 1px solid #c6c8cb; + border-bottom-color: transparent; + cursor: default; +} + +.nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} + +.nav-tabs.nav-justified>li { + float: none; +} + +.nav-tabs.nav-justified>li>a { + text-align: center; + margin-bottom: 5px; +} + +.nav-tabs.nav-justified>.dropdown .dropdown-menu { + top: auto; + left: auto; +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified>li { + display: table-cell; + width: 1%; + } + .nav-tabs.nav-justified>li>a { + margin-bottom: 0; + } +} + +.nav-tabs.nav-justified>li>a { + margin-right: 0; + border-radius: 4px; +} + +.nav-tabs.nav-justified>.active>a, +.nav-tabs.nav-justified>.active>a:hover, +.nav-tabs.nav-justified>.active>a:focus { + border: 1px solid #dddddd; +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified>li>a { + border-bottom: 1px solid #dddddd; + border-radius: 4px 4px 0 0; + } + .nav-tabs.nav-justified>.active>a, + .nav-tabs.nav-justified>.active>a:hover, + .nav-tabs.nav-justified>.active>a:focus { + border-bottom-color: #f6f6f7; + } +} + +.nav.nav-tabs { + margin-left: 5%; + width: 90%; +} + +.custom-ul { + /*padding-bottom: 50px;*/ + padding-top: 50px; +} + +.custom-li { + /*padding-bottom: 15px;*/ + padding-top: 15px; +} + +.custom-a { + padding: 15px; +} + +.file_attachments h2 { + float: none !important; +} + +.field-container { + height: 39.5px; + margin-bottom: 10px; +} + +button.button__modal_submit { + width: 100%; + height: 39.5px; + margin-top: 20px !important; +} + +form>fieldset { + margin-bottom: 20px; +} + +.stats2 { + color: #11493b; + font-size: .875em; + font-family: Lato, sans-serif; +} + +.star-filled { + color: #11493b; +} + +.star-empty { + color: #757575; +} diff --git a/app/v2/stylesheets/main.scss b/app/v2/stylesheets/main.scss index 5f371ab7..d68f11fd 100644 --- a/app/v2/stylesheets/main.scss +++ b/app/v2/stylesheets/main.scss @@ -1213,5 +1213,7 @@ custom-field { @import "working-group"; @import "contributions-page"; @import "voting-stage"; +@import "../partials/contribution/page"; +@import "../partials/contribution/add-attachment-form"; @import "../partials/proposal/voting-summary-proposal-page"; @import "../components/copyright/copyright"; From adf2c1b4c6d893451b70f6e17f5b98e698e5d451 Mon Sep 17 00:00:00 2001 From: Cristhian Parra Date: Wed, 18 Oct 2017 16:57:36 -0300 Subject: [PATCH 23/28] Add attachment in proposal/idea page, including adding resource by URL and embedding of youtube/vimeo videos in media --- app/app.js | 6 +- app/services/appCivistService.js | 3 +- app/v2/controllers/contribution/page.js | 146 ++++++++++++++---- .../contribution/add-attachment-form.html | 20 ++- app/v2/partials/contribution/page.html | 40 +++-- app/v2/stylesheets/new-dashboard.scss | 11 +- 6 files changed, 173 insertions(+), 53 deletions(-) diff --git a/app/app.js b/app/app.js index 7cc86cb8..94a6929f 100644 --- a/app/app.js +++ b/app/app.js @@ -136,8 +136,12 @@ '*://etherpad.appcivist.org/**', '*://testetherpad.appcivist.org/**', '*://www.youtube.com/**', + '*://youtube.com/**', + '*://youtu.be/**', '*://drive.google.com/**', - '*://docs.google.com/**' + '*://docs.google.com/**', + '*://vimeo.com/**', + '*://player.vimeo.com/**' ]); /** diff --git a/app/services/appCivistService.js b/app/services/appCivistService.js index 113e28f3..579ae755 100644 --- a/app/services/appCivistService.js +++ b/app/services/appCivistService.js @@ -1460,7 +1460,8 @@ appCivistApp.factory('Space', ['$resource', 'localStorageService', 'Contribution * @param {number} rsid - The resource ID. */ deleteResource(sid, rsid) { - return $resource(getServerBaseUrl(localStorageService) + '/space/:sid/resource/:rsid', { sid: sid, rsid: rsid }, { 'delete': { method: 'DELETE' } }).delete().$promise; + return $resource(getServerBaseUrl(localStorageService) + '/space/:sid/resource/:rsid', { sid: sid, rsid: rsid }, + { 'delete': { method: 'DELETE' } }).delete().$promise; }, /** diff --git a/app/v2/controllers/contribution/page.js b/app/v2/controllers/contribution/page.js index edab9dae..432f6da8 100644 --- a/app/v2/controllers/contribution/page.js +++ b/app/v2/controllers/contribution/page.js @@ -39,6 +39,8 @@ $scope.seeHistory = seeHistory.bind($scope); $scope.loadUserFeedback = loadUserFeedback.bind($scope); $scope.toggleOpenAddAttachment = toggleOpenAddAttachment.bind($scope); + $scope.toggleOpenAddAttachmentByUrl = toggleOpenAddAttachmentByUrl.bind($scope); + $scope.sanitizeVideoResourceUrl = sanitizeVideoResourceUrl.bind($scope); activate(); @@ -46,6 +48,7 @@ ModalMixin.init($scope); $scope.updateFeedback = updateFeedback.bind($scope); $scope.submitAttachment = submitAttachment.bind($scope); + $scope.submitAttachmentByUrl = submitAttachmentByUrl.bind($scope); $scope.createAttachmentResource = createAttachmentResource.bind($scope); $scope.activeTab = 'Public'; $scope.feedbackBar = false; @@ -153,12 +156,18 @@ $scope.showCommentType = 'members'; } }); + $scope.resources = {}; } function toggleOpenAddAttachment () { $scope.openAddAttachment = !$scope.openAddAttachment; } + function toggleOpenAddAttachmentByUrl () { + $scope.openAddAttachment = !$scope.openAddAttachment; + $scope.openAddAttachmentByUrl = !$scope.openAddAttachmentByUrl; + } + function startSpinner () { this.spinnerActive = true; usSpinnerService.spin('contributions-page'); @@ -488,40 +497,108 @@ }, transformRequest: angular.identity, }).then(function (response) { - - vm.createAttachmentResource(response.data.url); + let resource = { + name: response.data.name, + url: response.data.url + } + vm.createAttachmentResource(resource, true); }, function (error) { Notify.show('Error while uploading file to the server', 'error'); }); } + + /** + * Upload the given file to the server. Also, attachs it to + * the current contribution. + */ + function submitAttachmentByUrl() { + var vm = this; + this.startSpinner(); + let resource = { + name: this.newAttachment.name, + url: this.newAttachment.url + }; + vm.createAttachmentResource(resource, false); + } + + function sanitizeVideoResourceUrl(url) { + let ytRegex = (/(http|https):\/\/(youtube\.com|www\.youtube\.com|youtu\.be)/); + let vimeoRegex = (/(http|https):\/\/(vimeo\.com|www\.vimeo\.com)/); + let vimeoEmbedRegex = (/(http|https):\/\/(player\.vimeo\.com)/); + + if (ytRegex.test(url)) { + return url.replace('watch?v=', 'embed/'); + } else if (vimeoRegex.test(url) && !vimeoEmbedRegex.test(url)) { + return url.replace('vimeo.com','player.vimeo.com/video'); + } else { + return url; + } + } /** * After the file has been uploaded, we should relate it with the contribution. * * @param {string} url - The uploaded file's url. */ - function createAttachmentResource(url) { + function createAttachmentResource(resource, isNewUploadedFile) { var vm = this; - var isPicture = (/\.(gif|jpg|jpeg|tiff|png)$/i).test(this.newAttachment.name); - var rType = isPicture ? "PICTURE" : "FILE"; + let pictureRegex = (/(gif|jpg|jpeg|tiff|png)$/i); + let videoRegex = (/(gif|jpg|jpeg|tiff|png)$/i); + let onlineVideoRegex = (/(http|https):\/\/(youtube\.com|www\.youtube\.com|youtu\.be|vimeo\.com|www\.vimeo\.com)/); + + let fileTypeContainingString = resource.name; // If + let resourceName = resource.name; + let resourceUrl = resource.url; - var attachment = Contributions.newAttachmentObject({ url: url, name: this.newAttachment.name, resourceType: rType}); + let isPicture = false; + let isVideo = false; + let rType = "FILE"; + + if (isNewUploadedFile) { + fileTypeContainingString = this.newAttachment.file.type; + resourceName = this.newAttachment.name; + isPicture = pictureRegex.test(fileTypeContainingString); + if (!isPicture) + isVideo = videoRegex.test(fileTypeContainingString); + } else { + // If is not a new attachment and the resource is added by URL + // see if it is not a youtube or vimeo video + isVideo = onlineVideoRegex.test(resourceUrl); + if (!isVideo) + isPicture = pictureRegex.test(fileTypeContainingString); + if (!isPicture && !isVideo) + isVideo = videoRegex.test(fileTypeContainingString); + } + + rType = isPicture ? "PICTURE" : isVideo ? "VIDEO" : "FILE"; + + var attachment = Contributions.newAttachmentObject({ url: resourceUrl, name: resourceName, resourceType: rType}); var rsp = Contributions.contributionAttachment(this.assemblyID, this.proposalID).save(attachment).$promise; - rsp.then(function (response) { + rsp.then(function (response) { var type = "Attachments"; - if (!isPicture) { - if (!vm.documents) - vm.documents = []; - vm.documents.push(response); + if (!isPicture && !isVideo) { + if (!vm.resources.documents) + vm.resources.documents = []; + vm.resources.documents.push(response); vm.openAddAttachment = false; } else { - if (!vm.media) - vm.media = []; - vm.media.push(response); + if (!vm.resources.media) + vm.resources.media = []; + vm.resources.media.push(response); + type = "Media"; + if (isPicture) { + if (!vm.resources.pictures) + vm.resources.pictures = []; + vm.resources.pictures.push(response); + } + } + + if (isNewUploadedFile) { vm.openAddAttachment = false; - type = "MEDIA"; + } else { + vm.openAddAttachmentByUrl = false; } Notify.show('Attachment saved!. You can see it under "'+type+'"', 'success'); @@ -585,7 +662,7 @@ res = Space.resources($scope.proposal.resourceSpaceId).query(); } res.$promise.then(function (data) { - $scope.resources = data; + $scope.resources.all = data || []; loadPictureResources(); loadDocuments(); loadMedia(); @@ -595,25 +672,25 @@ } function loadPictureResources() { - $scope.resourcePictures = []; - if ($scope.resources.length > 0) { - for (let i in $scope.resources) { - if ($scope.resources[i].resourceType == 'PICTURE') { - $scope.resourcePictures.push($scope.resources[i]); - } - } - } + $scope.resources.pictures = $scope.resources.all.filter(resource => resource.resourceType !== 'PICTURE'); if ($scope.proposal.cover) { - $scope.resourcePictures.push($scope.proposal.cover); + $scope.resources.pictures.push($scope.proposal.cover); } } function loadDocuments() { - $scope.documents = $scope.resources.filter(resource => resource.resourceType !== 'PICTURE' && resource.resourceType !== 'VIDEO'); + $scope.resources.documents = $scope.resources.all.filter(resource => resource.resourceType !== 'PICTURE' && resource.resourceType !== 'VIDEO'); } function loadMedia() { - $scope.media = $scope.resources.filter(resource => resource.resourceType === 'PICTURE' || resource.resourceType === 'VIDEO'); + $scope.resources.media = $scope.resources.all + .filter(resource => resource.resourceType === 'PICTURE' || resource.resourceType === 'VIDEO') + .map((obj) => { + if (obj.resourceType === 'VIDEO') { + obj.embedUrl = $scope.sanitizeVideoResourceUrl(obj.url); + } + return obj; + }); } function loadCampaignConfig() { @@ -827,10 +904,19 @@ } function deleteAttachment(attachment) { - _.remove(this.proposal.attachments, { resourceId: attachment.resourceId }); - Space.deleteResource(this.proposal.resourceSpaceId, attachment.resourceId).then( - response => Notify.show('Attachment deleted successfully', 'success'), + response => { + _.remove(this.resources.all, { resourceId: attachment.resourceId }); + if (attachment.resourceType==='PICTURE') { + _.remove(this.resources.pictures, { resourceId: attachment.resourceId }); + _.remove(this.resources.media, { resourceId: attachment.resourceId }); + } else if (attachment.resourceType==='VIDEO') { + _.remove(this.resources.media, { resourceId: attachment.resourceId }); + } else { + _.remove(this.resources.documents, { resourceId: attachment.resourceId }); + } + Notify.show('Attachment deleted successfully', 'success'); + } , error => { Notify.show('Error while trying to delete attachment from the contribution', 'error'); } diff --git a/app/v2/partials/contribution/add-attachment-form.html b/app/v2/partials/contribution/add-attachment-form.html index 4349feea..26535e08 100644 --- a/app/v2/partials/contribution/add-attachment-form.html +++ b/app/v2/partials/contribution/add-attachment-form.html @@ -6,13 +6,27 @@
    -
    +
    +
    + +
    + +
    +
    - - + + + + + +
    diff --git a/app/v2/partials/contribution/page.html b/app/v2/partials/contribution/page.html index 9c8b1473..41925f4d 100644 --- a/app/v2/partials/contribution/page.html +++ b/app/v2/partials/contribution/page.html @@ -204,23 +204,24 @@

    {{contributionType|titlecase|translate}}

    +
    -